diff --git a/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py b/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py index 25c641c168..73a4d8af97 100644 --- a/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py +++ b/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py @@ -44,7 +44,15 @@ class IntegrateHierarchyToFtrack(pyblish.api.ContextPlugin): input_data = context.data["hierarchyContext"] - self.import_to_ftrack(input_data) + # self.import_to_ftrack(input_data) + + try: + self.import_to_ftrack(input_data) + except Exception as exc: + import sys + import traceback + self.log.info(traceback.format_exc(sys.exc_info())) + raise Exception("failed") def import_to_ftrack(self, input_data, parent=None): for entity_name in input_data: @@ -66,9 +74,9 @@ class IntegrateHierarchyToFtrack(pyblish.api.ContextPlugin): # try to find if entity already exists else: - query = '{} where name is "{}" and parent_id is "{}"'.format( - entity_type, entity_name, parent['id'] - ) + query = 'TypedContext where name is "{0}" and project.full_name is "{1}"'.format( + entity_name, self.ft_project["full_name"] + ) try: entity = self.session.query(query).one() except Exception: diff --git a/pype/plugins/global/publish/integrate_assumed_destination.py b/pype/plugins/global/publish/integrate_assumed_destination.py index 3bbd4cf33b..a26529fc2c 100644 --- a/pype/plugins/global/publish/integrate_assumed_destination.py +++ b/pype/plugins/global/publish/integrate_assumed_destination.py @@ -66,7 +66,7 @@ class IntegrateAssumedDestination(pyblish.api.InstancePlugin): """Create a filepath based on the current data available Example template: - {root}/{project}/{silo}/{asset}/publish/{subset}/v{version:0>3}/ + {root}/{project}/{asset}/publish/{subset}/v{version:0>3}/ {subset}.{representation} Args: instance: the instance to publish @@ -95,7 +95,6 @@ class IntegrateAssumedDestination(pyblish.api.InstancePlugin): assert asset, ("No asset found by the name '{}' " "in project '{}'".format(asset_name, project_name)) - silo = asset['silo'] subset = io.find_one({"type": "subset", "name": subset_name, @@ -126,7 +125,6 @@ class IntegrateAssumedDestination(pyblish.api.InstancePlugin): template_data = {"root": api.Session["AVALON_PROJECTS"], "project": {"name": project_name, "code": project['data']['code']}, - "silo": silo, "family": instance.data['family'], "asset": asset_name, "subset": subset_name,