Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion ayon_api/_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -2889,6 +2889,7 @@ def get_addon_site_settings(
def get_bundle_settings(
bundle_name: Optional[str] = None,
project_name: Optional[str] = None,
project_bundle_name: Optional[str] = None,
variant: Optional[str] = None,
site_id: Optional[str] = None,
use_site: bool = True,
Expand Down Expand Up @@ -2928,6 +2929,7 @@ def get_bundle_settings(
return con.get_bundle_settings(
bundle_name=bundle_name,
project_name=project_name,
project_bundle_name=project_bundle_name,
variant=variant,
site_id=site_id,
use_site=use_site,
Expand All @@ -2936,6 +2938,7 @@ def get_bundle_settings(

def get_addons_studio_settings(
bundle_name: Optional[str] = None,
project_bundle_name: Optional[str] = None,
variant: Optional[str] = None,
site_id: Optional[str] = None,
use_site: bool = True,
Expand All @@ -2951,6 +2954,8 @@ def get_addons_studio_settings(
Args:
bundle_name (Optional[str]): Name of bundle for which should be
settings received.
project_bundle_name (Optional[str]): Project bundle name 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]): Site id for which want to receive
Expand All @@ -2968,6 +2973,7 @@ def get_addons_studio_settings(
con = get_server_api_connection()
return con.get_addons_studio_settings(
bundle_name=bundle_name,
project_bundle_name=project_bundle_name,
variant=variant,
site_id=site_id,
use_site=use_site,
Expand All @@ -2978,6 +2984,7 @@ def get_addons_studio_settings(
def get_addons_project_settings(
project_name: str,
bundle_name: Optional[str] = None,
project_bundle_name: Optional[str] = None,
variant: Optional[str] = None,
site_id: Optional[str] = None,
use_site: bool = True,
Expand Down Expand Up @@ -3009,6 +3016,8 @@ def get_addons_project_settings(
received.
bundle_name (Optional[str]): Name of bundle for which should be
settings received.
project_bundle_name (Optional[str]): Project bundle name 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]): Site id for which want to receive
Expand All @@ -3028,6 +3037,7 @@ def get_addons_project_settings(
return con.get_addons_project_settings(
project_name=project_name,
bundle_name=bundle_name,
project_bundle_name=project_bundle_name,
variant=variant,
site_id=site_id,
use_site=use_site,
Expand All @@ -3037,6 +3047,7 @@ def get_addons_project_settings(

def get_addons_settings(
bundle_name: Optional[str] = None,
project_bundle_name: Optional[str] = None,
project_name: Optional[str] = None,
variant: Optional[str] = None,
site_id: Optional[str] = None,
Expand All @@ -3056,6 +3067,8 @@ def get_addons_settings(
Args:
bundle_name (Optional[str]): Name of bundle for which should be
settings received.
project_bundle_name (Optional[str]): Name of project 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']]): Name of
Expand All @@ -3072,6 +3085,7 @@ def get_addons_settings(
con = get_server_api_connection()
return con.get_addons_settings(
bundle_name=bundle_name,
project_bundle_name=project_bundle_name,
project_name=project_name,
variant=variant,
site_id=site_id,
Expand Down Expand Up @@ -6887,6 +6901,7 @@ def create_link(
output_id: str,
output_type: str,
link_name: Optional[str] = None,
data: Optional[dict[str, Any]] = None,
) -> CreateLinkData:
"""Create link between 2 entities.

Expand All @@ -6906,7 +6921,8 @@ def create_link(
output_id (str): Output entity id.
output_type (str): Entity type of output entity.
link_name (Optional[str]): Name of link.
Available from server version '1.0.0-rc.6'.
data (Optional[dict[str, Any]]): Additional data to be stored
with the link.

Returns:
CreateLinkData: Information about link.
Expand All @@ -6924,6 +6940,7 @@ def create_link(
output_id=output_id,
output_type=output_type,
link_name=link_name,
data=data,
Comment on lines 6904 to 6943
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR seems to include: #308

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall PR seems to work, except for this change?

)


Expand Down
15 changes: 15 additions & 0 deletions ayon_api/_api_helpers/bundles_addons.py
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,7 @@ def get_bundle_settings(
self,
bundle_name: Optional[str] = None,
project_name: Optional[str] = None,
project_bundle_name: Optional[str] = None,
variant: Optional[str] = None,
site_id: Optional[str] = None,
use_site: bool = True,
Expand Down Expand Up @@ -714,6 +715,7 @@ def get_bundle_settings(
query = prepare_query_string({
"project_name": project_name or None,
"bundle_name": bundle_name or None,
"project_bundle_name": project_bundle_name or None,
"variant": variant or self.get_default_settings_variant() or None,
"site_id": site_id,
})
Expand All @@ -724,6 +726,7 @@ def get_bundle_settings(
def get_addons_studio_settings(
self,
bundle_name: Optional[str] = None,
project_bundle_name: Optional[str] = None,
variant: Optional[str] = None,
site_id: Optional[str] = None,
use_site: bool = True,
Expand All @@ -739,6 +742,8 @@ def get_addons_studio_settings(
Args:
bundle_name (Optional[str]): Name of bundle for which should be
settings received.
project_bundle_name (Optional[str]): Project bundle name 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]): Site id for which want to receive
Expand All @@ -755,6 +760,7 @@ def get_addons_studio_settings(
"""
output = self.get_bundle_settings(
bundle_name=bundle_name,
project_bundle_name=project_bundle_name,
variant=variant,
site_id=site_id,
use_site=use_site
Expand All @@ -770,6 +776,7 @@ def get_addons_project_settings(
self,
project_name: str,
bundle_name: Optional[str] = None,
project_bundle_name: Optional[str] = None,
variant: Optional[str] = None,
site_id: Optional[str] = None,
use_site: bool = True,
Expand Down Expand Up @@ -801,6 +808,8 @@ def get_addons_project_settings(
received.
bundle_name (Optional[str]): Name of bundle for which should be
settings received.
project_bundle_name (Optional[str]): Project bundle name 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]): Site id for which want to receive
Expand All @@ -822,6 +831,7 @@ def get_addons_project_settings(
output = self.get_bundle_settings(
project_name=project_name,
bundle_name=bundle_name,
project_bundle_name=project_bundle_name,
variant=variant,
site_id=site_id,
use_site=use_site
Expand All @@ -836,6 +846,7 @@ def get_addons_project_settings(
def get_addons_settings(
self,
bundle_name: Optional[str] = None,
project_bundle_name: Optional[str] = None,
project_name: Optional[str] = None,
variant: Optional[str] = None,
site_id: Optional[str] = None,
Expand All @@ -855,6 +866,8 @@ def get_addons_settings(
Args:
bundle_name (Optional[str]): Name of bundle for which should be
settings received.
project_bundle_name (Optional[str]): Name of project 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']]): Name of
Expand All @@ -871,6 +884,7 @@ def get_addons_settings(
if project_name is None:
return self.get_addons_studio_settings(
bundle_name=bundle_name,
project_bundle_name=project_bundle_name,
variant=variant,
site_id=site_id,
use_site=use_site,
Expand All @@ -880,6 +894,7 @@ def get_addons_settings(
return self.get_addons_project_settings(
project_name=project_name,
bundle_name=bundle_name,
project_bundle_name=project_bundle_name,
variant=variant,
site_id=site_id,
use_site=use_site,
Expand Down