Ayon-Python-Api 0.2.2__tar.gz → 0.3.0__tar.gz

ayon-python-api-0.3.0/PKG-INFO

@@ -0,0 +1,283 @@
+Metadata-Version: 2.1
+Name: ayon-python-api
+Version: 0.3.0
+Summary: AYON Python API
+Home-page: https://github.com/ynput/ayon-python-api
+Author: ynput.io
+Author-email: "ynput.io" <info@ynput.io>
+License:                                  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.
+        
+Project-URL: Repository, https://github.com/ynput/ayon-python-api
+Project-URL: Changelog, https://github.com/ynput/ayon-python-api/releases
+Keywords: AYON,ynput,OpenPype,vfx
+Classifier: Development Status :: 3 - Alpha
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# AYON server API
+Python client for connection server. Client must be (at least for some time) Python 2 compatible because will be used in DCC that are "older".
+
+AYON Python api should support connection to server with raw REST functions and prepared functionality for work with entities. Must not contain only functionality that can be used with core server functionality.
+
+Module support singleton connection which is using `AYON_SERVER_URL` and `AYON_API_KEY` environment variables as source for connection. The singleton connection is using `ServerAPI` object. There can be created multiple connection to different server at one time, for that purpose use `ServerAPIBase` object.
+
+## Install
+AYON python api is available on PyPi:
+
+    pip install ayon-python-api
+
+For development purposes you may follow [build](#build-wheel) guide to build and install custom wheels.
+
+
+## Cloning the repository
+Repository does not have submodules or special cases. Clone is simple as:
+
+    git clone git@github.com:ynput/ayon-python-api.git
+
+
+## Build wheel
+For wheel build is required a `wheel` module from PyPi:
+
+    pip install wheel
+
+Open terminal and change directory to ayon-python-api repository and build wheel:
+
+    cd <REPOSITORY ROOT>/ayon-python-api
+    python setup.py sdist bdist_wheel   
+    
+
+Once finished a wheel should be created in `./dist/ayon_python_api-<VERSION>-py3-none-any`.
+
+---
+
+### Wheel installation
+The wheel file can be used to install using pip:
+
+    pip install <REPOSITORY ROOT>/dist/ayon_python_api-<VERSION>-py3-none-any
+
+If pip complain that `ayon-python-api` is already installed just uninstall existing one first:
+    
+    pip uninstall ayon-python-api
+
+
+## TODOs
+- Find more suitable name of `ServerAPI` objects (right now is used `con` or `connection`)
+- Add all available CRUD operation on entities using REST
+- Add folder and task changes to operations
+- Enhance entity hub
+  - Missing docstrings in EntityHub -> especially entity arguments are missing
+  - Better order of arguments for entity classes
+    - Move entity hub to first place
+    - Skip those which are invalid for the entity and fake it for base or remove it from base
+  - Entity hub should use operations session to do changes
+  - Entity hub could also handle 'subset', 'version' and 'representation' entities
+  - Missing 'statuses' on project
+  - Missing 'status' on folders
+  - Missing assignees on tasks
+  - Pass docstrings and arguments definitions from `ServerAPI` methods to global functions
+- Split `ServerAPI` into smaller chunks (somehow), the class has 4k+ lines of code
+- Add .pyi stub for ServerAPI 
+- Missing websockets connection

{ayon-python-api-0.2.2 → ayon-python-api-0.3.0}/ayon_api/__init__.py

@@ -101,6 +101,7 @@ from ._api import (
     get_addon_studio_settings,
     get_addon_project_settings,
     get_addon_settings,
+    get_bundle_settings,
     get_addons_studio_settings,
     get_addons_project_settings,
     get_addons_settings,
@@ -280,6 +281,7 @@ __all__ = (
     "get_addon_studio_settings",
     "get_addon_project_settings",
     "get_addon_settings",
+    "get_bundle_settings",
     "get_addons_studio_settings",
     "get_addons_project_settings",
     "get_addons_settings",

{ayon-python-api-0.2.2 → ayon-python-api-0.3.0}/ayon_api/_api.py

@@ -688,6 +688,11 @@ def get_addon_site_settings(*args, **kwargs):
     return con.get_addon_site_settings(*args, **kwargs)
 
 
+def get_bundle_settings(*args, **kwargs):
+    con = get_server_api_connection()
+    return con.get_bundle_settings(*args, **kwargs)
+
+
 def get_addons_studio_settings(*args, **kwargs):
     con = get_server_api_connection()
     return con.get_addons_studio_settings(*args, **kwargs)

{ayon-python-api-0.2.2 → ayon-python-api-0.3.0}/ayon_api/server_api.py

@@ -310,9 +310,9 @@ class ServerAPI(object):
             connection is created from the same machine under same user.
         client_version (Optional[str]): Version of client application (used in
             desktop client application).
-        default_settings_variant (Optional[str]): Settings variant used by
-            default if a method for settings won't get any (by default is
-            'production').
+        default_settings_variant (Optional[Literal["production", "staging"]]):
+            Settings variant used by default if a method for settings won't
+            get any (by default is 'production').
         ssl_verify (Union[bool, str, None]): Verify SSL certificate
             Looks for env variable value 'AYON_CA_FILE' by default. If not
             available then 'True' is used.
@@ -341,7 +341,10 @@ class ServerAPI(object):
         self._access_token = token
         self._site_id = site_id
         self._client_version = client_version
-        self._default_settings_variant = default_settings_variant
+        self._default_settings_variant = (
+            default_settings_variant
+            or "production"
+        )
 
         if ssl_verify is None:
             # Custom AYON env variable for CA file or 'True'
@@ -527,9 +530,13 @@ class ServerAPI(object):
                 as default variant.
 
         Args:
-            variant (Union[str, None]): Settings variant name.
+            variant (Literal['production', 'staging']): Settings variant name.
         """
 
+        if variant not in ("production", "staging"):
+            raise ValueError((
+                "Invalid variant name {}. Expected 'production' or 'staging'"
+            ).format(variant))
         self._default_settings_variant = variant
 
     default_settings_variant = property(
@@ -2038,12 +2045,13 @@ class ServerAPI(object):
         """
 
         major, minor, patch, _, _ = self.server_version_tuple
-        if major == 0 and (minor < 2 or (minor == 2 and patch < 1)):
+        if major == 0 and (minor > 2 or (minor == 2 and patch >= 1)):
+            url = "desktop/dependency_packages/{}".format(filename)
+        else:
+            # Backwards compatibility for AYON server 0.2.0 and lower
             if platform_name is None:
                 platform_name = platform.system().lower()
             url = "dependencies/{}/{}".format(filename, platform_name)
-        else:
-            url = "desktop/dependency_packages/{}".format(filename)
 
         response = self.delete(url)
         if response.status != 200:
@@ -2082,12 +2090,13 @@ class ServerAPI(object):
        """
 
         major, minor, patch, _, _ = self.server_version_tuple
-        if major == 0 and (minor < 2 or (minor == 2 and patch < 1)):
+        if major == 0 and (minor > 2 or (minor == 2 and patch >= 1)):
+            url = "desktop/dependency_packages/{}".format(src_filename)
+        else:
+            # Backwards compatibility for AYON server 0.2.0 and lower
             if platform_name is None:
                 platform_name = platform.system().lower()
             url = "dependencies/{}/{}".format(src_filename, platform_name)
-        else:
-            url = "desktop/dependency_packages/{}".format(src_filename)
 
         package_filepath = os.path.join(dst_directory, dst_filename)
         self.download_file(
@@ -2114,12 +2123,13 @@ class ServerAPI(object):
         """
 
         major, minor, patch, _, _ = self.server_version_tuple
-        if major == 0 and (minor < 2 or (minor == 2 and patch < 1)):
+        if major == 0 and (minor > 2 or (minor == 2 and patch >= 1)):
+            url = "desktop/dependency_packages/{}".format(dst_filename)
+        else:
+            # Backwards compatibility for AYON server 0.2.0 and lower
             if platform_name is None:
                 platform_name = platform.system().lower()
             url = "dependencies/{}/{}".format(dst_filename, platform_name)
-        else:
-            url = "desktop/dependency_packages/{}".format(dst_filename)
 
         self.upload_file(url, src_filepath, progress=progress)
 
@@ -2404,17 +2414,17 @@ class ServerAPI(object):
     ):
         """Addon studio settings.
 
-       Receive studio settings for specific version of an addon.
+        Receive studio settings for specific version of an addon.
 
-       Args:
-           addon_name (str): Name of addon.
-           addon_version (str): Version of addon.
-           variant (Optional[str]): Name of settings variant. By default,
-                is used 'default_settings_variant' passed on init.
+        Args:
+            addon_name (str): Name of addon.
+            addon_version (str): Version of addon.
+            variant (Optional[Literal['production', 'staging']]): Name of
+                settings variant. Used 'default_settings_variant' by default.
 
-       Returns:
+        Returns:
            dict[str, Any]: Addon settings.
-       """
+        """
 
         if variant is None:
             variant = self.default_settings_variant
@@ -2452,8 +2462,8 @@ class ServerAPI(object):
             addon_version (str): Version of addon.
             project_name (str): Name of project for which the settings are
                 received.
-            variant (Optional[str]): Name of settings variant. By default,
-                is used 'production'.
+            variant (Optional[Literal['production', 'staging']]): Name of
+                settings variant. Used 'default_settings_variant' by default.
             site_id (Optional[str]): Name of site which is used for site
                 overrides. Is filled with connection 'site_id' attribute
                 if not passed.
@@ -2509,8 +2519,8 @@ class ServerAPI(object):
             project_name (Optional[str]): Name of project for which the
                 settings are received. A studio settings values are received
                 if is 'None'.
-            variant (Optional[str]): Name of settings variant. By default,
-                is used 'production'.
+            variant (Optional[Literal['production', 'staging']]): Name of
+                settings variant. Used 'default_settings_variant' by default.
             site_id (Optional[str]): Name of site which is used for site
                 overrides. Is filled with connection 'site_id' attribute
                 if not passed.
@@ -2560,12 +2570,106 @@ class ServerAPI(object):
         result.raise_for_status()
         return result.data
 
-    def get_addons_studio_settings(self, variant=None, only_values=True):
+    def get_bundle_settings(
+        self,
+        bundle_name=None,
+        project_name=None,
+        variant=None,
+        site_id=None,
+        use_site=True
+    ):
+        """Get complete set of settings for given data.
+
+        If project is not passed then studio settings are returned. If variant
+        is not passed 'default_settings_variant' is used. If bundle name is
+        not passed then current production/staging bundle is used, based on
+        variant value.
+
+        Output contains addon settings and site settings in single dictionary.
+
+        TODOs:
+            - test how it behaves if there is not any bundle.
+            - test how it behaves if there is not any production/staging
+                bundle.
+
+        Warnings:
+            For AYON server < 0.3.0 bundle name will be ignored.
+
+        Example output:
+            {
+                "addons": [
+                    {
+                        "name": "addon-name",
+                        "version": "addon-version",
+                        "settings": {...}
+                        "siteSettings": {...}
+                    }
+                ]
+            }
+
+        Returns:
+            dict[str, Any]: All settings for single bundle.
+        """
+
+        major, minor, _, _, _ = self.server_version_tuple
+        query_values = {
+            key: value
+            for key, value in (
+                ("project_name", project_name),
+                ("variant", variant or self.default_settings_variant),
+                ("bundle_name", bundle_name),
+            )
+            if value
+        }
+        if use_site:
+            if not site_id:
+                site_id = self.site_id
+            if site_id:
+                query_values["site_id"] = site_id
+
+        if major == 0 and minor >= 3:
+            url = "settings"
+        else:
+            # Backward compatibility for AYON server < 0.3.0
+            url = "settings/addons"
+            query_values.pop("bundle_name", None)
+            for new_key, old_key in (
+                ("project_name", "project"),
+                ("site_id", "site"),
+            ):
+                if new_key in query_values:
+                    query_values[old_key] = query_values.pop(new_key)
+
+        query = prepare_query_string(query_values)
+        response = self.get("{}{}".format(url, query))
+        response.raise_for_status()
+        return response.data
+
+    def get_addons_studio_settings(
+        self,
+        bundle_name=None,
+        variant=None,
+        site_id=None,
+        use_site=True,
+        only_values=True
+    ):
         """All addons settings in one bulk.
 
+        Warnings:
+            Behavior of this function changed with AYON server version 0.3.0.
+                Structure of output from server changed. If using
+                'only_values=True' then output should be same as before.
+
         Args:
-            variant (Optional[Literal[production, staging]]): Variant of
-                settings. By default, is used 'production'.
+            bundle_name (Optional[str]): Name of bundle for which should be
+                settings received.
+            variant (Optional[Literal['production', 'staging']]): Name of
+                settings variant. Used 'default_settings_variant' by default.
+            site_id (Optional[str]): Id of site for which want to receive
+                site overrides.
+            use_site (bool): To force disable option of using site overrides
+                set to 'False'. In that case won't be applied any site
+                overrides.
             only_values (Optional[bool]): Output will contain only settings
                 values without metadata about addons.
 
@@ -2573,20 +2677,28 @@ class ServerAPI(object):
             dict[str, Any]: Settings of all addons on server.
         """
 
-        query_values = {}
-        if variant:
-            query_values["variant"] = variant
-        query = prepare_query_string(query_values)
-        response = self.get("settings/addons{}".format(query))
-        response.raise_for_status()
-        output = response.data
+        output = self.get_bundle_settings(
+            bundle_name=bundle_name,
+            variant=variant,
+            site_id=site_id,
+            use_site=use_site
+        )
         if only_values:
-            output = output["settings"]
+            major, minor, patch, _, _ = self.server_version_tuple
+            if major == 0 and minor >= 3:
+                output = {
+                    addon["name"]: addon["settings"]
+                    for addon in output["addons"]
+                }
+            else:
+                # Backward compatibility for AYON server < 0.3.0
+                output = output["settings"]
         return output
 
     def get_addons_project_settings(
         self,
         project_name,
+        bundle_name=None,
         variant=None,
         site_id=None,
         use_site=True,
@@ -2605,11 +2717,18 @@ class ServerAPI(object):
         argument which is by default set to 'True'. In that case output
         contains only value of 'settings' key.
 
+        Warnings:
+            Behavior of this function changed with AYON server version 0.3.0.
+                Structure of output from server changed. If using
+                'only_values=True' then output should be same as before.
+
         Args:
             project_name (str): Name of project for which are settings
                 received.
-            variant (Optional[Literal[production, staging]]): Variant of
-                settings. By default, is used 'production'.
+            bundle_name (Optional[str]): Name of bundle for which should be
+                settings received.
+            variant (Optional[Literal['production', 'staging']]): Name of
+                settings variant. Used 'default_settings_variant' by default.
             site_id (Optional[str]): Id of site for which want to receive
                 site overrides.
             use_site (bool): To force disable option of using site overrides
@@ -2623,27 +2742,31 @@ class ServerAPI(object):
                 project.
         """
 
-        query_values = {
-            "project": project_name
-        }
-        if variant:
-            query_values["variant"] = variant
-
-        if use_site:
-            if not site_id:
-                site_id = self.default_settings_variant
-            if site_id:
-                query_values["site"] = site_id
-        query = prepare_query_string(query_values)
-        response = self.get("settings/addons{}".format(query))
-        response.raise_for_status()
-        output = response.data
+        if not project_name:
+            raise ValueError("Project name must be passed.")
+
+        output = self.get_bundle_settings(
+            project_name=project_name,
+            bundle_name=bundle_name,
+            variant=variant,
+            site_id=site_id,
+            use_site=use_site
+        )
         if only_values:
-            output = output["settings"]
+            major, minor, patch, _, _ = self.server_version_tuple
+            if major == 0 and minor >= 3:
+                output = {
+                    addon["name"]: addon["settings"]
+                    for addon in output["addons"]
+                }
+            else:
+                # Backward compatibility for AYON server < 0.3.0
+                output = output["settings"]
         return output
 
     def get_addons_settings(
         self,
+        bundle_name=None,
         project_name=None,
         variant=None,
         site_id=None,
@@ -2655,11 +2778,18 @@ class ServerAPI(object):
         Based on 'project_name' will receive studio settings or project
         settings. In case project is not passed is 'site_id' ignored.
 
+        Warnings:
+            Behavior of this function changed with AYON server version 0.3.0.
+                Structure of output from server changed. If using
+                'only_values=True' then output should be same as before.
+
         Args:
+            bundle_name (Optional[str]): Name of bundle for which should be
+                settings received.
             project_name (Optional[str]): Name of project for which should be
                 settings received.
-            variant (Optional[Literal[production, staging]]): Settings variant.
-                By default, is used 'production'.
+            variant (Optional[Literal['production', 'staging']]): Name of
+                settings variant. Used 'default_settings_variant' by default.
             site_id (Optional[str]): Id of site for which want to receive
                 site overrides.
             use_site (Optional[bool]): To force disable option of using site
@@ -2670,10 +2800,21 @@ class ServerAPI(object):
         """
 
         if project_name is None:
-            return self.get_addons_studio_settings(variant, only_values)
+            return self.get_addons_studio_settings(
+                bundle_name=bundle_name,
+                variant=variant,
+                site_id=site_id,
+                use_site=use_site,
+                only_values=only_values
+            )
 
         return self.get_addons_project_settings(
-            project_name, variant, site_id, use_site, only_values
+            project_name=project_name,
+            bundle_name=bundle_name,
+            variant=variant,
+            site_id=site_id,
+            use_site=use_site,
+            only_values=only_values
         )
 
     # Entity getters

{ayon-python-api-0.2.2 → ayon-python-api-0.3.0}/ayon_api/version.py

@@ -1,2 +1,2 @@
 """Package declaring Python API for Ayon server."""
-__version__ = "0.2.2"
+__version__ = "0.3.0"

ayon-python-api-0.3.0/ayon_python_api.egg-info/PKG-INFO

@@ -0,0 +1,283 @@
+Metadata-Version: 2.1
+Name: ayon-python-api
+Version: 0.3.0
+Summary: AYON Python API
+Home-page: https://github.com/ynput/ayon-python-api
+Author: ynput.io
+Author-email: "ynput.io" <info@ynput.io>
+License:                                  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.
+        
+Project-URL: Repository, https://github.com/ynput/ayon-python-api
+Project-URL: Changelog, https://github.com/ynput/ayon-python-api/releases
+Keywords: AYON,ynput,OpenPype,vfx
+Classifier: Development Status :: 3 - Alpha
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# AYON server API
+Python client for connection server. Client must be (at least for some time) Python 2 compatible because will be used in DCC that are "older".
+
+AYON Python api should support connection to server with raw REST functions and prepared functionality for work with entities. Must not contain only functionality that can be used with core server functionality.
+
+Module support singleton connection which is using `AYON_SERVER_URL` and `AYON_API_KEY` environment variables as source for connection. The singleton connection is using `ServerAPI` object. There can be created multiple connection to different server at one time, for that purpose use `ServerAPIBase` object.
+
+## Install
+AYON python api is available on PyPi:
+
+    pip install ayon-python-api
+
+For development purposes you may follow [build](#build-wheel) guide to build and install custom wheels.
+
+
+## Cloning the repository
+Repository does not have submodules or special cases. Clone is simple as:
+
+    git clone git@github.com:ynput/ayon-python-api.git
+
+
+## Build wheel
+For wheel build is required a `wheel` module from PyPi:
+
+    pip install wheel
+
+Open terminal and change directory to ayon-python-api repository and build wheel:
+
+    cd <REPOSITORY ROOT>/ayon-python-api
+    python setup.py sdist bdist_wheel   
+    
+
+Once finished a wheel should be created in `./dist/ayon_python_api-<VERSION>-py3-none-any`.
+
+---
+
+### Wheel installation
+The wheel file can be used to install using pip:
+
+    pip install <REPOSITORY ROOT>/dist/ayon_python_api-<VERSION>-py3-none-any
+
+If pip complain that `ayon-python-api` is already installed just uninstall existing one first:
+    
+    pip uninstall ayon-python-api
+
+
+## TODOs
+- Find more suitable name of `ServerAPI` objects (right now is used `con` or `connection`)
+- Add all available CRUD operation on entities using REST
+- Add folder and task changes to operations
+- Enhance entity hub
+  - Missing docstrings in EntityHub -> especially entity arguments are missing
+  - Better order of arguments for entity classes
+    - Move entity hub to first place
+    - Skip those which are invalid for the entity and fake it for base or remove it from base
+  - Entity hub should use operations session to do changes
+  - Entity hub could also handle 'subset', 'version' and 'representation' entities
+  - Missing 'statuses' on project
+  - Missing 'status' on folders
+  - Missing assignees on tasks
+  - Pass docstrings and arguments definitions from `ServerAPI` methods to global functions
+- Split `ServerAPI` into smaller chunks (somehow), the class has 4k+ lines of code
+- Add .pyi stub for ServerAPI 
+- Missing websockets connection

ayon-python-api-0.3.0/pyproject.toml

@@ -0,0 +1,40 @@
+[project]
+name = "ayon-python-api"
+version = "0.3.0"
+description = "AYON Python API"
+license = {file = "LICENSE"}
+readme = {file = "README.md", content-type = "text/markdown"}
+authors = [
+    {name = "ynput.io", email = "info@ynput.io"}
+]
+keywords = ["AYON", "ynput", "OpenPype", "vfx"]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 2",
+    "Programming Language :: Python :: 3",
+]
+dependencies = [
+    "requests >= 2.27.1",
+    "six >= 1.15",
+    "Unidecode >= 1.2.0",
+    "appdirs >=1, <2",
+]
+
+[project.urls]
+Repository = "https://github.com/ynput/ayon-python-api"
+Changelog = "https://github.com/ynput/ayon-python-api/releases"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry.dependencies]
+python = ">=2.7,>=3.6.5"
+requests = "^2.28.1"
+six = "^1.15"
+Unidecode = "1.2.0" # Python 2 support
+appdirs = "^1.4"
+
+[tool.poetry.dev-dependencies]
+pytest = "^5.2"

ayon-python-api-0.2.2/PKG-INFO

@@ -1,80 +0,0 @@
-Metadata-Version: 2.1
-Name: ayon-python-api
-Version: 0.2.2
-Summary: AYON Python API
-Home-page: https://github.com/ynput/ayon-python-api
-Author: ynput.io
-Author-email: info@ynput.io
-License: Apache License (2.0)
-Keywords: AYON,ynput,OpenPype,vfx
-Classifier: Development Status :: 3 - Alpha
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 3
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-# AYON server API
-Python client for connection server. Client must be (at least for some time) Python 2 compatible because will be used in DCC that are "older".
-
-AYON Python api should support connection to server with raw REST functions and prepared functionality for work with entities. Must not contain only functionality that can be used with core server functionality.
-
-Module support singleton connection which is using `AYON_SERVER_URL` and `AYON_API_KEY` environment variables as source for connection. The singleton connection is using `ServerAPI` object. There can be created multiple connection to different server at one time, for that purpose use `ServerAPIBase` object.
-
-## Install
-AYON python api is available on PyPi:
-
-    pip install ayon-python-api
-
-For development purposes you may follow [build](#build-wheel) guide to build and install custom wheels.
-
-
-## Cloning the repository
-Repository does not have submodules or special cases. Clone is simple as:
-
-    git clone git@github.com:ynput/ayon-python-api.git
-
-
-## Build wheel
-For wheel build is required a `wheel` module from PyPi:
-
-    pip install wheel
-
-Open terminal and change directory to ayon-python-api repository and build wheel:
-
-    cd <REPOSITORY ROOT>/ayon-python-api
-    python setup.py sdist bdist_wheel   
-    
-
-Once finished a wheel should be created in `./dist/ayon_python_api-<VERSION>-py3-none-any`.
-
----
-
-### Wheel installation
-The wheel file can be used to install using pip:
-
-    pip install <REPOSITORY ROOT>/dist/ayon_python_api-<VERSION>-py3-none-any
-
-If pip complain that `ayon-python-api` is already installed just uninstall existing one first:
-    
-    pip uninstall ayon-python-api
-
-
-## TODOs
-- Find more suitable name of `ServerAPI` objects (right now is used `con` or `connection`)
-- Add all available CRUD operation on entities using REST
-- Add folder and task changes to operations
-- Enhance entity hub
-  - Missing docstrings in EntityHub -> especially entity arguments are missing
-  - Better order of arguments for entity classes
-    - Move entity hub to first place
-    - Skip those which are invalid for the entity and fake it for base or remove it from base
-  - Entity hub should use operations session to do changes
-  - Entity hub could also handle 'subset', 'version' and 'representation' entities
-  - Missing 'statuses' on project
-  - Missing 'status' on folders
-  - Missing assignees on tasks
-  - Pass docstrings and arguments definitions from `ServerAPI` methods to global functions
-- Split `ServerAPI` into smaller chunks (somehow), the class has 4k+ lines of code
-- Add .pyi stub for ServerAPI 
-- Missing websockets connection

ayon-python-api-0.2.2/ayon_python_api.egg-info/PKG-INFO

@@ -1,80 +0,0 @@
-Metadata-Version: 2.1
-Name: ayon-python-api
-Version: 0.2.2
-Summary: AYON Python API
-Home-page: https://github.com/ynput/ayon-python-api
-Author: ynput.io
-Author-email: info@ynput.io
-License: Apache License (2.0)
-Keywords: AYON,ynput,OpenPype,vfx
-Classifier: Development Status :: 3 - Alpha
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 3
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-# AYON server API
-Python client for connection server. Client must be (at least for some time) Python 2 compatible because will be used in DCC that are "older".
-
-AYON Python api should support connection to server with raw REST functions and prepared functionality for work with entities. Must not contain only functionality that can be used with core server functionality.
-
-Module support singleton connection which is using `AYON_SERVER_URL` and `AYON_API_KEY` environment variables as source for connection. The singleton connection is using `ServerAPI` object. There can be created multiple connection to different server at one time, for that purpose use `ServerAPIBase` object.
-
-## Install
-AYON python api is available on PyPi:
-
-    pip install ayon-python-api
-
-For development purposes you may follow [build](#build-wheel) guide to build and install custom wheels.
-
-
-## Cloning the repository
-Repository does not have submodules or special cases. Clone is simple as:
-
-    git clone git@github.com:ynput/ayon-python-api.git
-
-
-## Build wheel
-For wheel build is required a `wheel` module from PyPi:
-
-    pip install wheel
-
-Open terminal and change directory to ayon-python-api repository and build wheel:
-
-    cd <REPOSITORY ROOT>/ayon-python-api
-    python setup.py sdist bdist_wheel   
-    
-
-Once finished a wheel should be created in `./dist/ayon_python_api-<VERSION>-py3-none-any`.
-
----
-
-### Wheel installation
-The wheel file can be used to install using pip:
-
-    pip install <REPOSITORY ROOT>/dist/ayon_python_api-<VERSION>-py3-none-any
-
-If pip complain that `ayon-python-api` is already installed just uninstall existing one first:
-    
-    pip uninstall ayon-python-api
-
-
-## TODOs
-- Find more suitable name of `ServerAPI` objects (right now is used `con` or `connection`)
-- Add all available CRUD operation on entities using REST
-- Add folder and task changes to operations
-- Enhance entity hub
-  - Missing docstrings in EntityHub -> especially entity arguments are missing
-  - Better order of arguments for entity classes
-    - Move entity hub to first place
-    - Skip those which are invalid for the entity and fake it for base or remove it from base
-  - Entity hub should use operations session to do changes
-  - Entity hub could also handle 'subset', 'version' and 'representation' entities
-  - Missing 'statuses' on project
-  - Missing 'status' on folders
-  - Missing assignees on tasks
-  - Pass docstrings and arguments definitions from `ServerAPI` methods to global functions
-- Split `ServerAPI` into smaller chunks (somehow), the class has 4k+ lines of code
-- Add .pyi stub for ServerAPI 
-- Missing websockets connection

ayon-python-api-0.2.2/pyproject.toml

@@ -1,19 +0,0 @@
-[tool.poetry]
-name = "ayon_api"
-version = "0.2.2"
-description = "Python api for AYON server"
-authors = ["ynput.io <info@ynput.io>"]
-
-[tool.poetry.dependencies]
-python = ">=2.7,>=3.6.5"
-requests = "^2.28.1"
-six = "^1.15"
-Unidecode = "1.2.0" # Python 2 support
-appdirs = "^1.4"
-
-[tool.poetry.dev-dependencies]
-pytest = "^5.2"
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"