Merge pull request #1 from upsidetravel/fix/legal-docs

updated legal docs

Author: jaygorrell

CONTRIBUTING.md

@@ -5,17 +5,19 @@ You will need:
 
 ## Getting started
 
-To get your development environment setup, run:
+To get your development environment set up, run:
 
 ```sh
 pip install -e .[dev]
 ```
 
-This will install the repo version of `graphene-pydantic` and then install the
-development dependencies. Once that has completed, you can start developing.
+in an activated virtual environment. This will install the repo version of
+`graphene-pydantic` and then install the development dependencies. Once that
+has completed, you can start developing.
 
 ## Contributor License Agreement
 
+
 We require all contributors to sign the [Upside CLA](./CONTRIBUTOR_LICENSE_AGREEMENT.md).
 
 In simple terms, the CLA affirms that the work you're contributing is original,
@@ -30,5 +32,5 @@ businesses, republish modified source, and more. Please reference the license of
 this project to learn more.
 
 To sign the CLA, open a pull request as usual. If you haven't signed the CLA
-yet. We cannot merge any pull request until the CLA is signed. You only need to
+yet, we cannot merge any pull request until the CLA is signed. You only need to
 sign the CLA once.

CONTRIBUTOR_LICENSE_AGREEMENT.md

@@ -1,44 +1,29 @@
 # Human-Friendly Summary
 
-This is a human-readable summary of (and not a substitute for) the full agreement. This highlights only some of key terms of the CLA. It has no legal value and you should carefully review all the terms of the actual CLA before agreeing.
-Grant of copyright license. You give Upside permission to use your copyrighted work in commercial products.
-Grant of patent license. If your contributed work uses a patent, you give Upside a license to use that patent including within commercial products. You also agree that you have permission to grant this license.
-No Warranty or Support Obligations. By making a contribution, you are not obligating yourself to provide support for the contribution, and you are not taking on any warranty obligations or providing any assurances about how it will perform.
-The CLA does not change the terms of the standard open source license used by our software such as Apache. You are still free to use our projects within your own projects or businesses, republish modified source, and more. Please reference the appropriate license for the project you're contributing to learn more.
+This is a human-readable summary of (and not a substitute for) the full agreement. This highlights only some of key terms of the CLA. It has no legal value and you should carefully review all the terms of the actual CLA before agreeing. Grant of copyright license. You give Upside permission to use your copyrighted work in commercial products. Grant of patent license. If your contributed work uses a patent, you give Upside a license to use that patent including within commercial products. You also agree that you have permission to grant this license. No Warranty or Support Obligations. By making a contribution, you are not obligating yourself to provide support for the contribution, and you are not taking on any warranty obligations or providing any assurances about how it will perform. The CLA does not change the terms of the standard open source license used by our software such as Apache. You are still free to use our projects within your own projects or businesses, republish modified source, and more. Please reference the appropriate license for the project you’re contributing to learn more.
 
 # Upside Individual Contributor License Agreement
 
-In order to clarify the intellectual property license granted with Contributions from any person or entity, The Upside Travel Company, LLC ("Upside") must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of Upside; it does not change your rights to use your own Contributions for any other purpose.
+In order to clarify the intellectual property license granted with Contributions from any person or entity, The Upside Travel Company, LLC (“Upside”) must have a Contributor License Agreement (“CLA”) on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of Upside; it does not change your rights to use your own Contributions for any other purpose.
 
 You accept and agree to the following terms and conditions for Your present and future Contributions submitted to Upside. Except for the license granted herein to Upside and recipients of software distributed by Upside, You reserve all right, title, and interest in and to Your Contributions.
 
 1. Definitions.
 
-"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with Upside. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. 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 the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with Upside. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. 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.
 
-"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Upside for inclusion in, or documentation of, any of the products owned or managed by Upside (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Upside 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, Upside for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+  “Contribution” shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Upside for inclusion in, or documentation of, any of the products owned or managed by Upside (the “Work”). For the purposes of this definition, “submitted” means any form of electronic, verbal, or written communication sent to Upside 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, Upside for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as “Not a Contribution.”
 
+2. Grant of Copyright License.  Subject to the terms and conditions of this Agreement, You hereby grant to Upside and to recipients of software distributed by Upside 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 Your Contributions and such derivative works.
 
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this Agreement, You hereby grant to Upside and to recipients of software distributed by Upside 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 Your Contributions and such derivative works.
-
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this Agreement, You hereby grant to Upside and to recipients of software distributed by Upside 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 You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
-
+3. Grant of Patent License.  Subject to the terms and conditions of this Agreement, You hereby grant to Upside and to recipients of software distributed by Upside 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 You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
 
 4. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to Upside, or that your employer has executed a separate Corporate CLA with Upside.
 
-
 5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.
 
+6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your 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.
 
-6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your 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.
-
-
-7. Should You wish to submit work that is not Your original creation, You may submit it to Upside separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".
-
+7. Should You wish to submit work that is not Your original creation, You may submit it to Upside separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as “Submitted on behalf of a third-party: [named here]”.
 
 8. You agree to notify Upside of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.

README.md

@@ -70,6 +70,10 @@ Please see [the examples directory](./examples) for more.
 
 This project is under the [Apache License](./LICENSE.md).
 
+### Third Party Code
+
+This project depends on third-party code which is subject to the licenses set forth in [Third Party Licenses](./THIRD_PARTY_LICENSES.md).
+
 ### Contributing
 
 Please see the [Contributing Guide](./CONTRIBUTING.md). Note that you must sign the [CLA](./CONTRIBUTOR_LICENSE_AGREEMENT.md).

DEPENDENCIES.md renamed to THIRD_PARTY_LICENSES.md

@@ -1,3 +1,5 @@
+from collections import OrderedDict
+from collections.abc import Mapping, Sequence
 import typing as T
 import uuid
 import datetime
@@ -149,10 +151,19 @@ def convert_generic_type(type_, field, registry=None):
     # Python functions like `isinstance()` don't work
     if origin == T.Union:
         return convert_union_type(type_, field, registry)
-    elif origin in (T.Dict, T.OrderedDict, T.Mapping):
+    elif origin in (T.Dict, T.OrderedDict, T.Mapping, dict, OrderedDict) or issubclass(
+        origin, Mapping
+    ):
         raise ConversionError("Don't know how to handle mappings in Graphene")
-    elif origin in (T.List, T.Set, T.Collection, T.Iterable):
-        return List(to_graphene_type(type_, field, registry))
+    elif origin in (T.List, T.Set, T.Collection, T.Iterable, list, set) or issubclass(
+        origin, Sequence
+    ):
+        wrapped_types = getattr(type_, "__args__", [])
+        if not wrapped_types:
+            raise ConversionError(
+                f"Don't know how to handle {type_} (generic: {origin})"
+            )
+        return List(to_graphene_type(wrapped_types[0], field, registry))
     else:
         raise ConversionError(f"Don't know how to handle {type_} (generic: {origin})")
 

graphene_pydantic/converters.py

@@ -31,8 +31,18 @@ def construct_fields(
     Currently simply fetches all the attributes from the Pydantic model's __fields__. In
     the future we hope to implement field-level overrides that we'll have to merge in.
     """
+    excluded: typing.Tuple[str, ...] = ()
+    if exclude_fields:
+        excluded = exclude_fields
+    elif only_fields:
+        excluded = tuple(k for k in model.__fields__ if k not in only_fields)
+
+    fields_to_convert = (
+        (k, v) for k, v in model.__fields__.items() if k not in excluded
+    )
+
     fields = {}
-    for name, field in model.__fields__.items():
+    for name, field in fields_to_convert:
         converted = convert_pydantic_field(field, registry)
         registry.register_orm_field(obj_type, name, field)
         fields[name] = converted