[Automated] Merged develop into main

Dockerfile.centos7

@@ -41,6 +41,8 @@ RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
 	    ncurses \
 	    ncurses-devel \
         qt5-qtbase-devel \
+        xcb-util-wm \
+        xcb-util-renderutil \
     && yum clean all
 
 # we need to build our own patchelf
@@ -92,7 +94,8 @@ RUN source $HOME/.bashrc \
 RUN cp /usr/lib64/libffi* ./build/exe.linux-x86_64-3.7/lib \
     && cp /usr/lib64/libssl* ./build/exe.linux-x86_64-3.7/lib \
     && cp /usr/lib64/libcrypto* ./build/exe.linux-x86_64-3.7/lib \
-    && cp /root/.pyenv/versions/${OPENPYPE_PYTHON_VERSION}/lib/libpython* ./build/exe.linux-x86_64-3.7/lib
+    && cp /root/.pyenv/versions/${OPENPYPE_PYTHON_VERSION}/lib/libpython* ./build/exe.linux-x86_64-3.7/lib \
+    && cp /usr/lib64/libxcb* ./build/exe.linux-x86_64-3.7/vendor/python/PySide2/Qt/lib
 
 RUN cd /opt/openpype \
     rm -rf ./vendor/bin

openpype/cli.py

@@ -356,9 +356,22 @@ def run(script):
               "--pyargs",
               help="Run tests from package",
               default=None)
-def runtests(folder, mark, pyargs):
+@click.option("-t",
+              "--test_data_folder",
+              help="Unzipped directory path of test file",
+              default=None)
+@click.option("-s",
+              "--persist",
+              help="Persist test DB and published files after test end",
+              default=None)
+@click.option("-a",
+              "--app_variant",
+              help="Provide specific app variant for test, empty for latest",
+              default=None)
+def runtests(folder, mark, pyargs, test_data_folder, persist, app_variant):
     """Run all automatic tests after proper initialization via start.py"""
-    PypeCommands().run_tests(folder, mark, pyargs)
+    PypeCommands().run_tests(folder, mark, pyargs, test_data_folder,
+                             persist, app_variant)
 
 
 @main.command()

openpype/hosts/aftereffects/plugins/publish/closeAE.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+"""Close AE after publish. For Webpublishing only."""
+import pyblish.api
+
+from avalon import aftereffects
+
+
+class CloseAE(pyblish.api.ContextPlugin):
+    """Close AE after publish. For Webpublishing only.
+    """
+
+    order = pyblish.api.IntegratorOrder + 14
+    label = "Close AE"
+    optional = True
+    active = True
+
+    hosts = ["aftereffects"]
+    targets = ["remotepublish"]
+
+    def process(self, context):
+        self.log.info("CloseAE")
+
+        stub = aftereffects.stub()
+        self.log.info("Shutting down AE")
+        stub.save()
+        stub.close()
+        self.log.info("AE closed")

openpype/hosts/aftereffects/plugins/publish/collect_current_file.py

@@ -8,7 +8,7 @@ from avalon import aftereffects
 class CollectCurrentFile(pyblish.api.ContextPlugin):
     """Inject the current working file into context"""
 
-    order = pyblish.api.CollectorOrder - 0.5
+    order = pyblish.api.CollectorOrder - 0.49
     label = "Current File"
     hosts = ["aftereffects"]
 

openpype/hosts/aftereffects/plugins/publish/collect_extension_version.py

@@ -0,0 +1,56 @@
+import os
+import re
+import pyblish.api
+
+from avalon import aftereffects
+
+
+class CollectExtensionVersion(pyblish.api.ContextPlugin):
+    """ Pulls and compares version of installed extension.
+
+        It is recommended to use same extension as in provided Openpype code.
+
+        Please use Anastasiy’s Extension Manager or ZXPInstaller to update
+        extension in case of an error.
+
+        You can locate extension.zxp in your installed Openpype code in
+        `repos/avalon-core/avalon/aftereffects`
+    """
+    # This technically should be a validator, but other collectors might be
+    # impacted with usage of obsolete extension, so collector that runs first
+    # was chosen
+    order = pyblish.api.CollectorOrder - 0.5
+    label = "Collect extension version"
+    hosts = ["aftereffects"]
+
+    optional = True
+    active = True
+
+    def process(self, context):
+        installed_version = aftereffects.stub().get_extension_version()
+
+        if not installed_version:
+            raise ValueError("Unknown version, probably old extension")
+
+        manifest_url = os.path.join(os.path.dirname(aftereffects.__file__),
+                                    "extension", "CSXS", "manifest.xml")
+
+        if not os.path.exists(manifest_url):
+            self.log.debug("Unable to locate extension manifest, not checking")
+            return
+
+        expected_version = None
+        with open(manifest_url) as fp:
+            content = fp.read()
+            found = re.findall(r'(ExtensionBundleVersion=")([0-9\.]+)(")',
+                               content)
+            if found:
+                expected_version = found[0][1]
+
+        if expected_version != installed_version:
+            msg = (
+                "Expected version '{}' found '{}'\n Please update"
+                " your installed extension, it might not work properly."
+            ).format(expected_version, installed_version)
+
+            raise ValueError(msg)

openpype/hosts/aftereffects/plugins/publish/extract_local_render.py

@@ -19,10 +19,9 @@ class ExtractLocalRender(openpype.api.Extractor):
         staging_dir = instance.data["stagingDir"]
         self.log.info("staging_dir::{}".format(staging_dir))
 
-        stub.render(staging_dir)
-
         # pull file name from Render Queue Output module
         render_q = stub.get_render_info()
+        stub.render(staging_dir)
         if not render_q:
             raise ValueError("No file extension set in Render Queue")
         _, ext = os.path.splitext(os.path.basename(render_q.file_name))

openpype/hosts/blender/hooks/pre_pyside_install.py

@@ -32,7 +32,7 @@ class InstallPySideToBlender(PreLaunchHook):
 
     def inner_execute(self):
         # Get blender's python directory
-        version_regex = re.compile(r"^2\.[0-9]{2}$")
+        version_regex = re.compile(r"^[2-3]\.[0-9]+$")
 
         executable = self.launch_context.executable.executable_path
         if os.path.basename(executable).lower() != "blender.exe":

openpype/hosts/flame/api/utils.py

@@ -27,6 +27,7 @@ def _sync_utility_scripts(env=None):
 
     fsd_paths = [os.path.join(
         HOST_DIR,
+        "api",
         "utility_scripts"
     )]
 

openpype/hosts/flame/hooks/pre_flame_setup.py

@@ -22,7 +22,7 @@ class FlamePrelaunch(PreLaunchHook):
     flame_python_exe = "/opt/Autodesk/python/2021/bin/python2.7"
 
     wtc_script_path = os.path.join(
-        opflame.HOST_DIR, "scripts", "wiretap_com.py")
+        opflame.HOST_DIR, "api", "scripts", "wiretap_com.py")
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

openpype/hosts/maya/plugins/load/load_image_plane.py

@@ -13,10 +13,14 @@ class CameraWindow(QtWidgets.QDialog):
         self.setWindowFlags(self.windowFlags() | QtCore.Qt.FramelessWindowHint)
 
         self.camera = None
+        self.static_image_plane = False
+        self.show_in_all_views = False
 
         self.widgets = {
             "label": QtWidgets.QLabel("Select camera for image plane."),
             "list": QtWidgets.QListWidget(),
+            "staticImagePlane": QtWidgets.QCheckBox(),
+            "showInAllViews": QtWidgets.QCheckBox(),
             "warning": QtWidgets.QLabel("No cameras selected!"),
             "buttons": QtWidgets.QWidget(),
             "okButton": QtWidgets.QPushButton("Ok"),
@@ -31,6 +35,9 @@ class CameraWindow(QtWidgets.QDialog):
         for camera in cameras:
             self.widgets["list"].addItem(camera)
 
+        self.widgets["staticImagePlane"].setText("Make Image Plane Static")
+        self.widgets["showInAllViews"].setText("Show Image Plane in All Views")
+
         # Build buttons.
         layout = QtWidgets.QHBoxLayout(self.widgets["buttons"])
         layout.addWidget(self.widgets["okButton"])
@@ -40,6 +47,8 @@ class CameraWindow(QtWidgets.QDialog):
         layout = QtWidgets.QVBoxLayout(self)
         layout.addWidget(self.widgets["label"])
         layout.addWidget(self.widgets["list"])
+        layout.addWidget(self.widgets["staticImagePlane"])
+        layout.addWidget(self.widgets["showInAllViews"])
         layout.addWidget(self.widgets["buttons"])
         layout.addWidget(self.widgets["warning"])
 
@@ -54,6 +63,8 @@ class CameraWindow(QtWidgets.QDialog):
         if self.camera is None:
             self.widgets["warning"].setVisible(True)
             return
+        self.show_in_all_views = self.widgets["showInAllViews"].isChecked()
+        self.static_image_plane = self.widgets["staticImagePlane"].isChecked()
 
         self.close()
 
@@ -65,15 +76,15 @@ class CameraWindow(QtWidgets.QDialog):
 class ImagePlaneLoader(api.Loader):
     """Specific loader of plate for image planes on selected camera."""
 
-    families = ["plate", "render"]
+    families = ["image", "plate", "render"]
     label = "Load imagePlane."
     representations = ["mov", "exr", "preview", "png"]
     icon = "image"
     color = "orange"
 
-    def load(self, context, name, namespace, data):
+    def load(self, context, name, namespace, data, options=None):
         import pymel.core as pm
-        
+
         new_nodes = []
         image_plane_depth = 1000
         asset = context['asset']['name']
@@ -85,17 +96,23 @@ class ImagePlaneLoader(api.Loader):
 
         # Get camera from user selection.
         camera = None
-        default_cameras = [
-            "frontShape", "perspShape", "sideShape", "topShape"
-        ]
-        cameras = [
-            x for x in pm.ls(type="camera") if x.name() not in default_cameras
-        ]
-        camera_names = {x.getParent().name(): x for x in cameras}
-        camera_names["Create new camera."] = "create_camera"
-        window = CameraWindow(camera_names.keys())
-        window.exec_()
-        camera = camera_names[window.camera]
+        is_static_image_plane = None
+        is_in_all_views = None
+        if data:
+            camera = pm.PyNode(data.get("camera"))
+            is_static_image_plane = data.get("static_image_plane")
+            is_in_all_views = data.get("in_all_views")
+
+        if not camera:
+            cameras = pm.ls(type="camera")
+            camera_names = {x.getParent().name(): x for x in cameras}
+            camera_names["Create new camera."] = "create_camera"
+            window = CameraWindow(camera_names.keys())
+            window.exec_()
+            camera = camera_names[window.camera]
+
+            is_static_image_plane = window.static_image_plane
+            is_in_all_views = window.show_in_all_views
 
         if camera == "create_camera":
             camera = pm.createNode("camera")
@@ -111,13 +128,14 @@ class ImagePlaneLoader(api.Loader):
 
         # Create image plane
         image_plane_transform, image_plane_shape = pm.imagePlane(
-            camera=camera, showInAllViews=False
+            fileName=context["representation"]["data"]["path"],
+            camera=camera, showInAllViews=is_in_all_views
         )
         image_plane_shape.depth.set(image_plane_depth)
 
-        image_plane_shape.imageName.set(
-            context["representation"]["data"]["path"]
-        )
+        if is_static_image_plane:
+            image_plane_shape.detach()
+            image_plane_transform.setRotation(camera.getRotation())
 
         start_frame = pm.playbackOptions(q=True, min=True)
         end_frame = pm.playbackOptions(q=True, max=True)

openpype/hosts/maya/plugins/publish/collect_look.py

@@ -492,6 +492,8 @@ class CollectLook(pyblish.api.InstancePlugin):
                 if not cmds.attributeQuery(attr, node=node, exists=True):
                     continue
                 attribute = "{}.{}".format(node, attr)
+                if cmds.getAttr(attribute, type=True) == "message":
+                    continue
                 node_attributes[attr] = cmds.getAttr(attribute)
 
             attributes.append({"name": node,

openpype/hosts/maya/plugins/publish/collect_render.py

@@ -224,14 +224,19 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
             # append full path
             full_exp_files = []
             aov_dict = {}
-
+            default_render_file = context.data.get('project_settings')\
+                .get('maya')\
+                .get('create')\
+                .get('CreateRender')\
+                .get('default_render_image_folder')
             # replace relative paths with absolute. Render products are
             # returned as list of dictionaries.
             publish_meta_path = None
             for aov in exp_files:
                 full_paths = []
                 for file in aov[aov.keys()[0]]:
-                    full_path = os.path.join(workspace, "renders", file)
+                    full_path = os.path.join(workspace, default_render_file,
+                                             file)
                     full_path = full_path.replace("\\", "/")
                     full_paths.append(full_path)
                     publish_meta_path = os.path.dirname(full_path)

openpype/hosts/maya/plugins/publish/validate_render_image_rule.py

@@ -23,11 +23,24 @@ class ValidateRenderImageRule(pyblish.api.InstancePlugin):
 
     def process(self, instance):
 
-        assert get_file_rule("images") == "renders", (
-            "Workspace's `images` file rule must be set to: renders"
+        default_render_file = self.get_default_render_image_folder(instance)
+
+        assert get_file_rule("images") == default_render_file, (
+            "Workspace's `images` file rule must be set to: {}".format(
+                default_render_file
+            )
         )
 
     @classmethod
     def repair(cls, instance):
-        pm.workspace.fileRules["images"] = "renders"
+        default = cls.get_default_render_image_folder(instance)
+        pm.workspace.fileRules["images"] = default
         pm.system.Workspace.save()
+
+    @staticmethod
+    def get_default_render_image_folder(instance):
+        return instance.context.data.get('project_settings')\
+            .get('maya') \
+            .get('create') \
+            .get('CreateRender') \
+            .get('default_render_image_folder')

openpype/hosts/nuke/plugins/publish/extract_render_local.py

@@ -42,10 +42,14 @@ class NukeRenderLocal(openpype.api.Extractor):
         self.log.info("Start frame: {}".format(first_frame))
         self.log.info("End frame: {}".format(last_frame))
 
+        # write node url might contain nuke's ctl expressin
+        # as [python ...]/path...
+        path = node["file"].evaluate()
+
         # Ensure output directory exists.
-        directory = os.path.dirname(node["file"].value())
-        if not os.path.exists(directory):
-            os.makedirs(directory)
+        out_dir = os.path.dirname(path)
+        if not os.path.exists(out_dir):
+            os.makedirs(out_dir)
 
         # Render frames
         nuke.execute(
@@ -58,15 +62,12 @@ class NukeRenderLocal(openpype.api.Extractor):
         if "slate" in families:
             first_frame += 1
 
-        path = node['file'].value()
-        out_dir = os.path.dirname(path)
         ext = node["file_type"].value()
 
         if "representations" not in instance.data:
             instance.data["representations"] = []
 
         collected_frames = os.listdir(out_dir)
-
         if len(collected_frames) == 1:
             repre = {
                 'name': ext,

openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py

@@ -67,7 +67,9 @@ class ValidateRenderedFrames(pyblish.api.InstancePlugin):
 
             if not repre.get("files"):
                 msg = ("no frames were collected, "
-                       "you need to render them")
+                       "you need to render them.\n"
+                       "Check properties of write node (group) and"
+                       "select 'Local' option in 'Publish' dropdown.")
                 self.log.error(msg)
                 raise ValidationException(msg)
 

openpype/hosts/photoshop/plugins/publish/collect_current_file.py

@@ -8,7 +8,7 @@ from avalon import photoshop
 class CollectCurrentFile(pyblish.api.ContextPlugin):
     """Inject the current working file into context"""
 
-    order = pyblish.api.CollectorOrder - 0.5
+    order = pyblish.api.CollectorOrder - 0.49
     label = "Current File"
     hosts = ["photoshop"]
 

openpype/hosts/photoshop/plugins/publish/collect_extension_version.py

@@ -0,0 +1,57 @@
+import os
+import re
+import pyblish.api
+
+from avalon import photoshop
+
+
+class CollectExtensionVersion(pyblish.api.ContextPlugin):
+    """ Pulls and compares version of installed extension.
+
+        It is recommended to use same extension as in provided Openpype code.
+
+        Please use Anastasiy’s Extension Manager or ZXPInstaller to update
+        extension in case of an error.
+
+        You can locate extension.zxp in your installed Openpype code in
+        `repos/avalon-core/avalon/photoshop`
+    """
+    # This technically should be a validator, but other collectors might be
+    # impacted with usage of obsolete extension, so collector that runs first
+    # was chosen
+    order = pyblish.api.CollectorOrder - 0.5
+    label = "Collect extension version"
+    hosts = ["photoshop"]
+
+    optional = True
+    active = True
+
+    def process(self, context):
+        installed_version = photoshop.stub().get_extension_version()
+
+        if not installed_version:
+            raise ValueError("Unknown version, probably old extension")
+
+        manifest_url = os.path.join(os.path.dirname(photoshop.__file__),
+                                    "extension", "CSXS", "manifest.xml")
+
+        if not os.path.exists(manifest_url):
+            self.log.debug("Unable to locate extension manifest, not checking")
+            return
+
+        expected_version = None
+        with open(manifest_url) as fp:
+            content = fp.read()
+
+            found = re.findall(r'(ExtensionBundleVersion=")([0-10\.]+)(")',
+                               content)
+            if found:
+                expected_version = found[0][1]
+
+        if expected_version != installed_version:
+            msg = "Expected version '{}' found '{}'\n".format(
+                expected_version, installed_version)
+            msg += "Please update your installed extension, it might not work "
+            msg += "properly."
+
+            raise ValueError(msg)

openpype/lib/applications.py

@@ -716,6 +716,8 @@ class ApplicationLaunchContext:
         # subprocess.Popen launch arguments (first argument in constructor)
         self.launch_args = executable.as_args()
         self.launch_args.extend(application.arguments)
+        if self.data.get("app_args"):
+            self.launch_args.extend(self.data.pop("app_args"))
 
         # Handle launch environemtns
         env = self.data.pop("env", None)

openpype/lib/avalon_context.py

@@ -508,13 +508,18 @@ def get_workdir_data(project_doc, asset_doc, task_name, host_name):
     Returns:
         dict: Data prepared for filling workdir template.
     """
-    hierarchy = "/".join(asset_doc["data"]["parents"])
-
     task_type = asset_doc['data']['tasks'].get(task_name, {}).get('type')
 
     project_task_types = project_doc["config"]["tasks"]
     task_code = project_task_types.get(task_type, {}).get("short_name")
 
+    asset_parents = asset_doc["data"]["parents"]
+    hierarchy = "/".join(asset_parents)
+
+    parent_name = project_doc["name"]
+    if asset_parents:
+        parent_name = asset_parents[-1]
+
     data = {
         "project": {
             "name": project_doc["name"],
@@ -526,6 +531,7 @@ def get_workdir_data(project_doc, asset_doc, task_name, host_name):
             "short": task_code,
         },
         "asset": asset_doc["name"],
+        "parent": parent_name,
         "app": host_name,
         "user": getpass.getuser(),
         "hierarchy": hierarchy,

openpype/lib/path_tools.py

@@ -307,7 +307,6 @@ class HostDirmap:
         mapping = {}
 
         if not project_settings["global"]["sync_server"]["enabled"]:
-            log.debug("Site Sync not enabled")
             return mapping
 
         from openpype.settings.lib import get_site_local_overrides

openpype/lib/remote_publish.py

@@ -2,6 +2,7 @@ import os
 from datetime import datetime
 import sys
 from bson.objectid import ObjectId
+import collections
 
 import pyblish.util
 import pyblish.api
@@ -11,6 +12,25 @@ from openpype.lib.mongo import OpenPypeMongoConnection
 from openpype.lib.plugin_tools import parse_json
 
 
+def headless_publish(log, close_plugin_name=None, is_test=False):
+    """Runs publish in a opened host with a context and closes Python process.
+
+        Host is being closed via ClosePS pyblish plugin which triggers 'exit'
+        method in ConsoleTrayApp.
+    """
+    if not is_test:
+        dbcon = get_webpublish_conn()
+        _id = os.environ.get("BATCH_LOG_ID")
+        if not _id:
+            log.warning("Unable to store log records, "
+                        "batch will be unfinished!")
+            return
+
+        publish_and_log(dbcon, _id, log, close_plugin_name)
+    else:
+        publish(log, close_plugin_name)
+
+
 def get_webpublish_conn():
     """Get connection to OP 'webpublishes' collection."""
     mongo_client = OpenPypeMongoConnection.get_mongo_client()
@@ -37,6 +57,33 @@ def start_webpublish_log(dbcon, batch_id, user):
     }).inserted_id
 
 
+def publish(log, close_plugin_name=None):
+    """Loops through all plugins, logs to console. Used for tests.
+
+        Args:
+            log (OpenPypeLogger)
+            close_plugin_name (str): name of plugin with responsibility to
+                close host app
+    """
+    # Error exit as soon as any error occurs.
+    error_format = "Failed {plugin.__name__}: {error} -- {error.traceback}"
+
+    close_plugin = _get_close_plugin(close_plugin_name, log)
+
+    for result in pyblish.util.publish_iter():
+        for record in result["records"]:
+            log.info("{}: {}".format(
+                result["plugin"].label, record.msg))
+
+        if result["error"]:
+            log.error(error_format.format(**result))
+            uninstall()
+            if close_plugin:  # close host app explicitly after error
+                context = pyblish.api.Context()
+                close_plugin().process(context)
+            sys.exit(1)
+
+
 def publish_and_log(dbcon, _id, log, close_plugin_name=None):
     """Loops through all plugins, logs ok and fails into OP DB.
 
@@ -140,7 +187,9 @@ def find_variant_key(application_manager, host):
 
     found_variant_key = None
     # finds most up-to-date variant if any installed
-    for variant_key, variant in app_group.variants.items():
+    sorted_variants = collections.OrderedDict(
+        sorted(app_group.variants.items()))
+    for variant_key, variant in sorted_variants.items():
         for executable in variant.executables:
             if executable.exists():
                 found_variant_key = variant_key

openpype/modules/base.py

@@ -29,6 +29,21 @@ from openpype.settings.lib import (
 from openpype.lib import PypeLogger
 
 
+DEFAULT_OPENPYPE_MODULES = (
+    "avalon_apps",
+    "clockify",
+    "log_viewer",
+    "muster",
+    "python_console_interpreter",
+    "slack",
+    "webserver",
+    "launcher_action",
+    "project_manager_action",
+    "settings_action",
+    "standalonepublish_action",
+)
+
+
 # Inherit from `object` for Python 2 hosts
 class _ModuleClass(object):
     """Fake module class for storing OpenPype modules.
@@ -272,17 +287,12 @@ def _load_modules():
     log = PypeLogger.get_logger("ModulesLoader")
 
     # Import default modules imported from 'openpype.modules'
-    for default_module_name in (
-        "settings_action",
-        "launcher_action",
-        "project_manager_action",
-        "standalonepublish_action",
-    ):
+    for default_module_name in DEFAULT_OPENPYPE_MODULES:
         try:
-            default_module = __import__(
-                "openpype.modules.{}".format(default_module_name),
-                fromlist=("", )
-            )
+            import_str = "openpype.modules.{}".format(default_module_name)
+            new_import_str = "{}.{}".format(modules_key, default_module_name)
+            default_module = __import__(import_str, fromlist=("", ))
+            sys.modules[new_import_str] = default_module
             setattr(openpype_modules, default_module_name, default_module)
 
         except Exception:

openpype/modules/default_modules/deadline/plugins/publish/submit_maya_deadline.py

@@ -394,9 +394,14 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         self.log.debug(filepath)
 
         # Gather needed data ------------------------------------------------
+        default_render_file = instance.context.data.get('project_settings')\
+            .get('maya')\
+            .get('create')\
+            .get('CreateRender')\
+            .get('default_render_image_folder')
         filename = os.path.basename(filepath)
         comment = context.data.get("comment", "")
-        dirname = os.path.join(workspace, "renders")
+        dirname = os.path.join(workspace, default_render_file)
         renderlayer = instance.data['setMembers']       # rs_beauty
         deadline_user = context.data.get("user", getpass.getuser())
         jobname = "%s - %s" % (filename, instance.name)

openpype/modules/default_modules/ftrack/lib/avalon_sync.py

@@ -360,6 +360,8 @@ class SyncEntitiesFactory:
         self._subsets_by_parent_id = None
         self._changeability_by_mongo_id = None
 
+        self._object_types_by_name = None
+
         self.all_filtered_entities = {}
         self.filtered_ids = []
         self.not_selected_ids = []
@@ -651,6 +653,18 @@ class SyncEntitiesFactory:
             self._bubble_changeability(list(self.subsets_by_parent_id.keys()))
         return self._changeability_by_mongo_id
 
+    @property
+    def object_types_by_name(self):
+        if self._object_types_by_name is None:
+            object_types_by_name = self.session.query(
+                "select id, name from ObjectType"
+            ).all()
+            self._object_types_by_name = {
+                object_type["name"]: object_type
+                for object_type in object_types_by_name
+            }
+        return self._object_types_by_name
+
     @property
     def all_ftrack_names(self):
         """
@@ -880,10 +894,7 @@ class SyncEntitiesFactory:
         custom_attrs, hier_attrs = get_openpype_attr(
             self.session, query_keys=self.cust_attr_query_keys
         )
-        ent_types = self.session.query("select id, name from ObjectType").all()
-        ent_types_by_name = {
-            ent_type["name"]: ent_type["id"] for ent_type in ent_types
-        }
+        ent_types_by_name = self.object_types_by_name
         # Custom attribute types
         cust_attr_types = self.session.query(
             "select id, name from CustomAttributeType"
@@ -2491,7 +2502,13 @@ class SyncEntitiesFactory:
         parent_entity = self.entities_dict[parent_id]["entity"]
 
         _name = av_entity["name"]
-        _type = av_entity["data"].get("entityType", "folder")
+        _type = av_entity["data"].get("entityType")
+        # Check existence of object type
+        if _type and _type not in self.object_types_by_name:
+            _type = None
+
+        if not _type:
+            _type = "Folder"
 
         self.log.debug((
             "Re-ceating deleted entity {} <{}>"