From dd14bfc2d29b3a18aa590f8dada4084b79248804 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:42:53 +0200
Subject: [PATCH 01/22] few line saving changes

---
 pype/ftrack/lib/ftrack_action_handler.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_action_handler.py b/pype/ftrack/lib/ftrack_action_handler.py
index 7fd7eccfb7..f2be4d9b84 100644
--- a/pype/ftrack/lib/ftrack_action_handler.py
+++ b/pype/ftrack/lib/ftrack_action_handler.py
@@ -23,17 +23,13 @@ class BaseAction(BaseHandler):
 
     def __init__(self, session, plugins_presets={}):
         '''Expects a ftrack_api.Session instance'''
-        super().__init__(session, plugins_presets)
-
         if self.label is None:
-            raise ValueError(
-                'Action missing label.'
-            )
+            raise ValueError('Action missing label.')
 
-        elif self.identifier is None:
-            raise ValueError(
-                'Action missing identifier.'
-            )
+        if self.identifier is None:
+            raise ValueError('Action missing identifier.')
+
+        super().__init__(session, plugins_presets)
 
     def register(self):
         '''
@@ -105,8 +101,7 @@ class BaseAction(BaseHandler):
 
         elif isinstance(result, dict):
             if 'items' in result:
-                items = result['items']
-                if not isinstance(items, list):
+                if not isinstance(result['items'], list):
                     raise ValueError('Invalid items format, must be list!')
 
             else:

From 3c0f5f5baa13e2478ee641a386c886759829ce25 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:44:36 +0200
Subject: [PATCH 02/22] app handler inherit from action handler instead of base
 handler

---
 pype/ftrack/lib/ftrack_app_handler.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_app_handler.py b/pype/ftrack/lib/ftrack_app_handler.py
index 56196d15f9..dcf7729ed7 100644
--- a/pype/ftrack/lib/ftrack_app_handler.py
+++ b/pype/ftrack/lib/ftrack_app_handler.py
@@ -1,17 +1,16 @@
 import os
 import sys
 import platform
-from avalon import lib as avalonlib
+import avalon.lib
 import acre
-from pype import api as pype
 from pype import lib as pypelib
 from pypeapp import config
-from .ftrack_base_handler import BaseHandler
+from .ftrack_action_handler import BaseAction
 
 from pypeapp import Anatomy
 
 
-class AppAction(BaseHandler):
+class AppAction(BaseAction):
     '''Custom Action base class
 
     <label> - a descriptive string identifing your action.
@@ -34,9 +33,9 @@ class AppAction(BaseHandler):
 
         if label is None:
             raise ValueError('Action missing label.')
-        elif name is None:
+        if name is None:
             raise ValueError('Action missing identifier.')
-        elif executable is None:
+        if executable is None:
             raise ValueError('Action missing executable.')
 
         self.label = label
@@ -195,7 +194,7 @@ class AppAction(BaseHandler):
 
         os.environ["AVALON_HIERARCHY"] = hierarchy
 
-        application = avalonlib.get_application(os.environ["AVALON_APP_NAME"])
+        application = avalon.lib.get_application(os.environ["AVALON_APP_NAME"])
 
         data = {
             "root": os.environ.get("PYPE_STUDIO_PROJECTS_MOUNT"),
@@ -293,7 +292,7 @@ class AppAction(BaseHandler):
                 # Store subprocess to varaible. This is due to Blender launch
                 # bug. Please make sure Blender >=2.81 can be launched before
                 # remove `_popen` variable.
-                _popen = avalonlib.launch(
+                _popen = avalon.lib.launch(
                     executable=execfile, args=[], environment=env
                 )
             else:
@@ -340,7 +339,7 @@ class AppAction(BaseHandler):
                 # Store subprocess to varaible. This is due to Blender launch
                 # bug. Please make sure Blender >=2.81 can be launched before
                 # remove `_popen` variable.
-                _popen = avalonlib.launch(
+                _popen = avalon.lib.launch(
                     '/usr/bin/env', args=['bash', execfile], environment=env
                 )
             else:

From 2fc6aafecfabb5a76db7e65627efeb3340b59f89 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:46:00 +0200
Subject: [PATCH 03/22] added get project from entity to base handler

---
 pype/ftrack/lib/ftrack_base_handler.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py
index f11cb020e9..952ac2e74f 100644
--- a/pype/ftrack/lib/ftrack_base_handler.py
+++ b/pype/ftrack/lib/ftrack_base_handler.py
@@ -623,3 +623,19 @@ class BaseHandler(object):
         self.log.debug((
             "Publishing event: {}"
         ).format(str(event.__dict__)))
+
+    def get_project_from_entity(self, entity):
+        low_entity_type = entity.entity_type.lower()
+        if low_entity_type == "project":
+            return entity
+
+        if low_entity_type == "reviewsession":
+            return entity["project"]
+
+        if low_entity_type == "filecomponent":
+            entity = entity["version"]
+
+        project_data = entity["link"][0]
+        return self.session.query(
+            "Project where id is {}".format(project_data["id"])
+        ).one()

From 28c737f3757587267c666c460d4af2cf0ad27efd Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:49:10 +0200
Subject: [PATCH 04/22] action `_launch` method modified to make more sence

---
 pype/ftrack/lib/ftrack_action_handler.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_action_handler.py b/pype/ftrack/lib/ftrack_action_handler.py
index f2be4d9b84..bbaf07ff97 100644
--- a/pype/ftrack/lib/ftrack_action_handler.py
+++ b/pype/ftrack/lib/ftrack_action_handler.py
@@ -58,28 +58,24 @@ class BaseAction(BaseHandler):
         )
 
     def _launch(self, event):
-        args = self._translate_event(
-            self.session, event
-        )
+        entities = self._translate_event(event)
 
         preactions_launched = self._handle_preactions(self.session, event)
         if preactions_launched is False:
             return
 
         interface = self._interface(
-            self.session, *args
+            self.session, entities, event
         )
 
         if interface:
             return interface
 
         response = self.launch(
-            self.session, *args
+            self.session, entities, event
         )
 
-        return self._handle_result(
-            self.session, response, *args
-        )
+        return self._handle_result(response)
 
     def _handle_result(self, session, result, entities, event):
         '''Validate the returned result from the action callback'''

From 9a08c8bad977b51b43421d237060fead260edc7f Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:50:04 +0200
Subject: [PATCH 05/22] `_discover` and `disover` methods moved to action
 handler

---
 pype/ftrack/lib/ftrack_action_handler.py | 37 +++++++++++++++++++++
 pype/ftrack/lib/ftrack_base_handler.py   | 42 ------------------------
 2 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_action_handler.py b/pype/ftrack/lib/ftrack_action_handler.py
index bbaf07ff97..af1a9d0811 100644
--- a/pype/ftrack/lib/ftrack_action_handler.py
+++ b/pype/ftrack/lib/ftrack_action_handler.py
@@ -57,6 +57,43 @@ class BaseAction(BaseHandler):
             self._launch
         )
 
+    def _discover(self, event):
+        entities = self._translate_event(event)
+        accepts = self.discover(self.session, entities, event)
+        if not accepts:
+            return
+
+        self.log.debug(u'Discovering action with selection: {0}'.format(
+            event['data'].get('selection', [])
+        ))
+
+        return {
+            'items': [{
+                'label': self.label,
+                'variant': self.variant,
+                'description': self.description,
+                'actionIdentifier': self.identifier,
+                'icon': self.icon,
+            }]
+        }
+
+    def discover(self, session, entities, event):
+        '''Return true if we can handle the selected entities.
+
+        *session* is a `ftrack_api.Session` instance
+
+
+        *entities* is a list of tuples each containing the entity type and the
+        entity id. If the entity is a hierarchical you will always get the
+        entity type TypedContext, once retrieved through a get operation you
+        will have the "real" entity type ie. example Shot, Sequence
+        or Asset Build.
+
+        *event* the unmodified original event
+
+        '''
+
+        return False
     def _launch(self, event):
         entities = self._translate_event(event)
 
diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py
index 952ac2e74f..6bbbd2f487 100644
--- a/pype/ftrack/lib/ftrack_base_handler.py
+++ b/pype/ftrack/lib/ftrack_base_handler.py
@@ -192,48 +192,6 @@ class BaseHandler(object):
 
         raise NotImplementedError()
 
-    def _discover(self, event):
-        items = {
-            'items': [{
-                'label': self.label,
-                'variant': self.variant,
-                'description': self.description,
-                'actionIdentifier': self.identifier,
-                'icon': self.icon,
-            }]
-        }
-
-        args = self._translate_event(
-            self.session, event
-        )
-
-        accepts = self.discover(
-            self.session, *args
-        )
-
-        if accepts is True:
-            self.log.debug(u'Discovering action with selection: {0}'.format(
-                event['data'].get('selection', [])))
-            return items
-
-    def discover(self, session, entities, event):
-        '''Return true if we can handle the selected entities.
-
-        *session* is a `ftrack_api.Session` instance
-
-
-        *entities* is a list of tuples each containing the entity type and the entity id.
-        If the entity is a hierarchical you will always get the entity
-        type TypedContext, once retrieved through a get operation you
-        will have the "real" entity type ie. example Shot, Sequence
-        or Asset Build.
-
-        *event* the unmodified original event
-
-        '''
-
-        return False
-
     def _translate_event(self, session, event):
         '''Return *event* translated structure to be used with the API.'''
 

From 35e25feff8e3aa3dd2da6447fd2c4de1373cd5be Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:52:07 +0200
Subject: [PATCH 06/22] `interface` and `_interface` moved to action handler

---
 pype/ftrack/lib/ftrack_action_handler.py | 42 ++++++++++++++++++++++++
 pype/ftrack/lib/ftrack_base_handler.py   | 28 ----------------
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_action_handler.py b/pype/ftrack/lib/ftrack_action_handler.py
index af1a9d0811..81c6421f52 100644
--- a/pype/ftrack/lib/ftrack_action_handler.py
+++ b/pype/ftrack/lib/ftrack_action_handler.py
@@ -94,6 +94,48 @@ class BaseAction(BaseHandler):
         '''
 
         return False
+
+    def _interface(self, session, entities, event):
+        interface = self.interface(session, entities, event)
+        if not interface:
+            return
+
+        if isinstance(interface, (tuple, list)):
+            return {"items": interface}
+
+        if isinstance(interface, dict):
+            if (
+                "items" in interface
+                or ("success" in interface and "message" in interface)
+            ):
+                return interface
+
+            raise ValueError((
+                "Invalid interface output expected key: \"items\" or keys:"
+                " \"success\" and \"message\". Got: \"{}\""
+            ).format(str(interface)))
+
+        raise ValueError(
+            "Invalid interface output type \"{}\"".format(
+                str(type(interface))
+            )
+        )
+
+    def interface(self, session, entities, event):
+        '''Return a interface if applicable or None
+
+        *session* is a `ftrack_api.Session` instance
+
+        *entities* is a list of tuples each containing the entity type and
+        the entity id. If the entity is a hierarchical you will always get the
+        entity type TypedContext, once retrieved through a get operation you
+        will have the "real" entity type ie. example Shot, Sequence
+        or Asset Build.
+
+        *event* the unmodified original event
+        '''
+        return None
+
     def _launch(self, event):
         entities = self._translate_event(event)
 
diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py
index 6bbbd2f487..911a8c7bb8 100644
--- a/pype/ftrack/lib/ftrack_base_handler.py
+++ b/pype/ftrack/lib/ftrack_base_handler.py
@@ -318,34 +318,6 @@ class BaseHandler(object):
 
         return False
 
-    def _interface(self, *args):
-        interface = self.interface(*args)
-        if interface:
-            if (
-                'items' in interface or
-                ('success' in interface and 'message' in interface)
-            ):
-                return interface
-
-            return {
-                'items': interface
-            }
-
-    def interface(self, session, entities, event):
-        '''Return a interface if applicable or None
-
-        *session* is a `ftrack_api.Session` instance
-
-        *entities* is a list of tuples each containing the entity type and the entity id.
-        If the entity is a hierarchical you will always get the entity
-        type TypedContext, once retrieved through a get operation you
-        will have the "real" entity type ie. example Shot, Sequence
-        or Asset Build.
-
-        *event* the unmodified original event
-        '''
-        return None
-
     def _handle_result(self, session, result, entities, event):
         '''Validate the returned result from the action callback'''
         if isinstance(result, bool):

From 5894c380cc9b13605f19f567e459e0525f88b9b1 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:53:09 +0200
Subject: [PATCH 07/22] _translate event expects only event and session is
 optional

---
 pype/ftrack/lib/ftrack_base_handler.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py
index 911a8c7bb8..37c3a0ffe6 100644
--- a/pype/ftrack/lib/ftrack_base_handler.py
+++ b/pype/ftrack/lib/ftrack_base_handler.py
@@ -192,8 +192,10 @@ class BaseHandler(object):
 
         raise NotImplementedError()
 
-    def _translate_event(self, session, event):
+    def _translate_event(self, event, session=None):
         '''Return *event* translated structure to be used with the API.'''
+        if session is None:
+            session = self.session
 
         _entities = event['data'].get('entities_object', None)
         if (
@@ -203,11 +205,10 @@ class BaseHandler(object):
             ) == ftrack_api.symbol.NOT_SET
         ):
             _entities = self._get_entities(event)
+            event['data']['entities_object'] = _entities
+
+        return _entities
 
-        return [
-            _entities,
-            event
-        ]
 
     def _get_entities(self, event, session=None):
         if session is None:

From ea445cede307a07abd6cc39d5963faa29d7bf180 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:54:31 +0200
Subject: [PATCH 08/22] `_get_entities` in base can care about ignore
 entityTypes so can be removed from event handler

---
 pype/ftrack/lib/ftrack_base_handler.py  | 30 +++++++++++++++++++------
 pype/ftrack/lib/ftrack_event_handler.py | 19 ----------------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py
index 37c3a0ffe6..6a78a19929 100644
--- a/pype/ftrack/lib/ftrack_base_handler.py
+++ b/pype/ftrack/lib/ftrack_base_handler.py
@@ -209,20 +209,36 @@ class BaseHandler(object):
 
         return _entities
 
+    def _get_entities(self, event, session=None, ignore=None):
+        entities = []
+        selection = event['data'].get('selection')
+        if not selection:
+            return entities
+
+        if ignore is None:
+            ignore = []
+        elif isinstance(ignore, str):
+            ignore = [ignore]
+
+        filtered_selection = []
+        for entity in selection:
+            if entity['entityType'] not in ignore:
+                filtered_selection.append(entity)
+
+        if not filtered_selection:
+            return entities
 
-    def _get_entities(self, event, session=None):
         if session is None:
             session = self.session
             session._local_cache.clear()
-        selection = event['data'].get('selection') or []
-        _entities = []
-        for entity in selection:
-            _entities.append(session.get(
+
+        for entity in filtered_selection:
+            entities.append(session.get(
                 self._get_entity_type(entity, session),
                 entity.get('entityId')
             ))
-        event['data']['entities_object'] = _entities
-        return _entities
+
+        return entities
 
     def _get_entity_type(self, entity, session=None):
         '''Return translated entity type tht can be used with API.'''
diff --git a/pype/ftrack/lib/ftrack_event_handler.py b/pype/ftrack/lib/ftrack_event_handler.py
index 80a86527ab..b4743fe01a 100644
--- a/pype/ftrack/lib/ftrack_event_handler.py
+++ b/pype/ftrack/lib/ftrack_event_handler.py
@@ -56,22 +56,3 @@ class BaseEvent(BaseHandler):
             event
         ]
 
-    def _get_entities(
-        self, session, event, ignore=['socialfeed', 'socialnotification']
-    ):
-        _selection = event['data'].get('entities', [])
-        _entities = list()
-        if isinstance(ignore, str):
-            ignore = list(ignore)
-        for entity in _selection:
-            if entity['entityType'] in ignore:
-                continue
-            _entities.append(
-                (
-                    session.get(
-                        self._get_entity_type(entity),
-                        entity.get('entityId')
-                    )
-                )
-            )
-        return _entities

From fd2b278141bfd0f436971f8f28f26be5e38dcc99 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:54:57 +0200
Subject: [PATCH 09/22] event handler's translate_event sets default ignore
 value

---
 pype/ftrack/lib/ftrack_event_handler.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_event_handler.py b/pype/ftrack/lib/ftrack_event_handler.py
index b4743fe01a..3175075f19 100644
--- a/pype/ftrack/lib/ftrack_event_handler.py
+++ b/pype/ftrack/lib/ftrack_event_handler.py
@@ -49,10 +49,10 @@ class BaseEvent(BaseHandler):
 
         self.launch(self.session, event)
 
-    def _translate_event(self, session, event):
+    def _translate_event(self, event, session=None):
         '''Return *event* translated structure to be used with the API.'''
-        return [
-            self._get_entities(session, event),
-            event
-        ]
-
+        return self._get_entities(
+            event,
+            session,
+            ignore=['socialfeed', 'socialnotification']
+        )

From 411f795b6f7cf6fddc36985d62f12e2e2fdaf35f Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:56:28 +0200
Subject: [PATCH 10/22] _handle resunt cares only about result

---
 pype/ftrack/lib/ftrack_action_handler.py | 38 ++++++++++--------------
 pype/ftrack/lib/ftrack_base_handler.py   |  7 +----
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_action_handler.py b/pype/ftrack/lib/ftrack_action_handler.py
index 81c6421f52..3c0e55757b 100644
--- a/pype/ftrack/lib/ftrack_action_handler.py
+++ b/pype/ftrack/lib/ftrack_action_handler.py
@@ -156,41 +156,33 @@ class BaseAction(BaseHandler):
 
         return self._handle_result(response)
 
-    def _handle_result(self, session, result, entities, event):
+    def _handle_result(self, result):
         '''Validate the returned result from the action callback'''
         if isinstance(result, bool):
             if result is True:
-                result = {
-                    'success': result,
-                    'message': (
-                        '{0} launched successfully.'.format(self.label)
-                    )
-                }
+                msg = 'Action {0} finished.'
             else:
-                result = {
-                    'success': result,
-                    'message': (
-                        '{0} launch failed.'.format(self.label)
-                    )
-                }
+                msg = 'Action {0} failed.'
 
-        elif isinstance(result, dict):
+            return {
+                'success': result,
+                'message': msg.format(self.label)
+            }
+
+        if isinstance(result, dict):
             if 'items' in result:
                 if not isinstance(result['items'], list):
                     raise ValueError('Invalid items format, must be list!')
 
             else:
                 for key in ('success', 'message'):
-                    if key in result:
+                    if key not in result:
                         continue
+                    raise KeyError('Missing required key: {0}.'.format(key))
+            return result
 
-                    raise KeyError(
-                        'Missing required key: {0}.'.format(key)
-                    )
-
-        else:
-            self.log.error(
-                'Invalid result type must be bool or dictionary!'
-            )
+        self.log.warning((
+            'Invalid result type \"{}\" must be bool or dictionary!'
+        ).format(str(type(result))))
 
         return result
diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py
index 6a78a19929..f0fd3b7354 100644
--- a/pype/ftrack/lib/ftrack_base_handler.py
+++ b/pype/ftrack/lib/ftrack_base_handler.py
@@ -335,7 +335,7 @@ class BaseHandler(object):
 
         return False
 
-    def _handle_result(self, session, result, entities, event):
+    def _handle_result(self, result):
         '''Validate the returned result from the action callback'''
         if isinstance(result, bool):
             if result is True:
@@ -364,11 +364,6 @@ class BaseHandler(object):
                         'Missing required key: {0}.'.format(key)
                     )
 
-        else:
-            self.log.error(
-                'Invalid result type must be bool or dictionary!'
-            )
-
         return result
 
     def show_message(self, event, input_message, result=False):

From 355a2bdcd28a618e36be266abd2dac5dce01f0eb Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:58:21 +0200
Subject: [PATCH 11/22] base handler has _launcher from event handler

---
 pype/ftrack/lib/ftrack_app_handler.py   | 10 +++-------
 pype/ftrack/lib/ftrack_base_handler.py  | 26 ++++---------------------
 pype/ftrack/lib/ftrack_event_handler.py |  6 ------
 3 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_app_handler.py b/pype/ftrack/lib/ftrack_app_handler.py
index dcf7729ed7..d626eedd2a 100644
--- a/pype/ftrack/lib/ftrack_app_handler.py
+++ b/pype/ftrack/lib/ftrack_app_handler.py
@@ -117,9 +117,7 @@ class AppAction(BaseAction):
         return True
 
     def _launch(self, event):
-        args = self._translate_event(
-            self.session, event
-        )
+        entities = self._translate_event(event)
 
         preactions_launched = self._handle_preactions(
             self.session, event
@@ -128,12 +126,10 @@ class AppAction(BaseAction):
             return
 
         response = self.launch(
-            self.session, *args
+            self.session, entities, event
         )
 
-        return self._handle_result(
-            self.session, response, *args
-        )
+        return self._handle_result(response)
 
     def launch(self, session, entities, event):
         '''Callback method for the custom action.
diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py
index f0fd3b7354..07fa35866e 100644
--- a/pype/ftrack/lib/ftrack_base_handler.py
+++ b/pype/ftrack/lib/ftrack_base_handler.py
@@ -267,30 +267,12 @@ class BaseHandler(object):
         )
 
     def _launch(self, event):
-        args = self._translate_event(
-            self.session, event
-        )
+        self.session.rollback()
+        self.session._local_cache.clear()
 
-        preactions_launched = self._handle_preactions(self.session, event)
-        if preactions_launched is False:
-            return
+        self.launch(self.session, event)
 
-        interface = self._interface(
-            self.session, *args
-        )
-
-        if interface:
-            return interface
-
-        response = self.launch(
-            self.session, *args
-        )
-
-        return self._handle_result(
-            self.session, response, *args
-        )
-
-    def launch(self, session, entities, event):
+    def launch(self, session, event):
         '''Callback method for the custom action.
 
         return either a bool ( True if successful or False if the action failed )
diff --git a/pype/ftrack/lib/ftrack_event_handler.py b/pype/ftrack/lib/ftrack_event_handler.py
index 3175075f19..770b942844 100644
--- a/pype/ftrack/lib/ftrack_event_handler.py
+++ b/pype/ftrack/lib/ftrack_event_handler.py
@@ -43,12 +43,6 @@ class BaseEvent(BaseHandler):
             priority=self.priority
         )
 
-    def _launch(self, event):
-        self.session.rollback()
-        self.session._local_cache.clear()
-
-        self.launch(self.session, event)
-
     def _translate_event(self, event, session=None):
         '''Return *event* translated structure to be used with the API.'''
         return self._get_entities(

From 9c7630a06f0cea0cca99e7a908559b831a3f7e61 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:58:39 +0200
Subject: [PATCH 12/22] app handler docstring shuffled a little bit

---
 pype/ftrack/lib/ftrack_app_handler.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_app_handler.py b/pype/ftrack/lib/ftrack_app_handler.py
index d626eedd2a..c529bc903d 100644
--- a/pype/ftrack/lib/ftrack_app_handler.py
+++ b/pype/ftrack/lib/ftrack_app_handler.py
@@ -134,17 +134,18 @@ class AppAction(BaseAction):
     def launch(self, session, entities, event):
         '''Callback method for the custom action.
 
-        return either a bool ( True if successful or False if the action failed )
-        or a dictionary with they keys `message` and `success`, the message should be a
-        string and will be displayed as feedback to the user, success should be a bool,
-        True if successful or False if the action failed.
+        return either a bool (True if successful or False if the action failed)
+        or a dictionary with they keys `message` and `success`, the message
+        should be a string and will be displayed as feedback to the user,
+        success should be a bool, True if successful or False if the action
+        failed.
 
         *session* is a `ftrack_api.Session` instance
 
-        *entities* is a list of tuples each containing the entity type and the entity id.
-        If the entity is a hierarchical you will always get the entity
-        type TypedContext, once retrieved through a get operation you
-        will have the "real" entity type ie. example Shot, Sequence
+        *entities* is a list of tuples each containing the entity type and
+        the entity id. If the entity is a hierarchical you will always get
+        the entity type TypedContext, once retrieved through a get operation
+        you will have the "real" entity type ie. example Shot, Sequence
         or Asset Build.
 
         *event* the unmodified original event

From c4327b32d0c7d092093e2319b296c5eec3dc05d4 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 19:01:51 +0200
Subject: [PATCH 13/22] action delete asset modified _launch

---
 pype/ftrack/actions/action_delete_asset.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pype/ftrack/actions/action_delete_asset.py b/pype/ftrack/actions/action_delete_asset.py
index fc9e66e4f8..6a3b724379 100644
--- a/pype/ftrack/actions/action_delete_asset.py
+++ b/pype/ftrack/actions/action_delete_asset.py
@@ -49,27 +49,23 @@ class DeleteAssetSubset(BaseAction):
 
     def _launch(self, event):
         try:
-            args = self._translate_event(
-                self.session, event
-            )
+            entities = self._translate_event(event)
             if "values" not in event["data"]:
                 self.dbcon.install()
-                return self._interface(self.session, *args)
+                return self._interface(self.session, entities, event)
 
-            confirmation = self.confirm_delete(*args)
+            confirmation = self.confirm_delete(entities, event)
             if confirmation:
                 return confirmation
 
             self.dbcon.install()
             response = self.launch(
-                self.session, *args
+                self.session, entities, event
             )
         finally:
             self.dbcon.uninstall()
 
-        return self._handle_result(
-            self.session, response, *args
-        )
+        return self._handle_result(response)
 
     def interface(self, session, entities, event):
         self.show_message(event, "Preparing data...", True)

From 3854831e757608a7300dece1bfd1b7626608c262 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 19:02:11 +0200
Subject: [PATCH 14/22] import in lib are specified

---
 pype/ftrack/lib/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pype/ftrack/lib/__init__.py b/pype/ftrack/lib/__init__.py
index 9da3b819b3..692461de87 100644
--- a/pype/ftrack/lib/__init__.py
+++ b/pype/ftrack/lib/__init__.py
@@ -1,9 +1,9 @@
 from . import avalon_sync
 from . import credentials
-from .ftrack_app_handler import *
-from .ftrack_event_handler import *
-from .ftrack_action_handler import *
-from .ftrack_base_handler import *
+from .ftrack_base_handler import BaseHandler
+from .ftrack_event_handler import BaseEvent
+from .ftrack_action_handler import BaseAction
+from .ftrack_app_handler import AppAction
 
 from .lib import (
     get_project_from_entity,

From 6d61e2d139e8aa8a93ab30da00021b1ea22c0105 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 19:20:08 +0200
Subject: [PATCH 15/22] move validation checks after initialization

---
 pype/ftrack/lib/ftrack_app_handler.py | 97 +++++++++++++--------------
 1 file changed, 46 insertions(+), 51 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_app_handler.py b/pype/ftrack/lib/ftrack_app_handler.py
index c529bc903d..f11153e70e 100644
--- a/pype/ftrack/lib/ftrack_app_handler.py
+++ b/pype/ftrack/lib/ftrack_app_handler.py
@@ -11,32 +11,27 @@ from pypeapp import Anatomy
 
 
 class AppAction(BaseAction):
-    '''Custom Action base class
+    """Application Action class.
 
-    <label> - a descriptive string identifing your action.
-    <varaint>   - To group actions together, give them the same
-                  label and specify a unique variant per action.
-    <identifier>  - a unique identifier for app.
-    <description>   - a verbose descriptive text for you action
-    <icon>  - icon in ftrack
-    '''
+    Args:
+        session (ftrack_api.Session): Session where action will be registered.
+        label (str): A descriptive string identifing your action.
+        varaint (str, optional): To group actions together, give them the same
+            label and specify a unique variant per action.
+        identifier (str): An unique identifier for app.
+        description (str): A verbose descriptive text for you action.
+        icon (str): Url path to icon which will be shown in Ftrack web.
+    """
 
-    type = 'Application'
-    preactions = ['start.timer']
+    type = "Application"
+    preactions = ["start.timer"]
 
     def __init__(
         self, session, label, name, executable, variant=None,
         icon=None, description=None, preactions=[], plugins_presets={}
     ):
         super().__init__(session, plugins_presets)
-        '''Expects a ftrack_api.Session instance'''
-
-        if label is None:
-            raise ValueError('Action missing label.')
-        if name is None:
-            raise ValueError('Action missing identifier.')
-        if executable is None:
-            raise ValueError('Action missing executable.')
+        """Expects a ftrack_api.Session instance"""
 
         self.label = label
         self.identifier = name
@@ -46,11 +41,18 @@ class AppAction(BaseAction):
         self.description = description
         self.preactions.extend(preactions)
 
+        if label is None:
+            raise ValueError("Action missing label.")
+        if name is None:
+            raise ValueError("Action missing identifier.")
+        if executable is None:
+            raise ValueError("Action missing executable.")
+
     def register(self):
-        '''Registers the action, subscribing the discover and launch topics.'''
+        """Registers the action, subscribing the discover and launch topics."""
 
         discovery_subscription = (
-            'topic=ftrack.action.discover and source.user.username={0}'
+            "topic=ftrack.action.discover and source.user.username={0}"
         ).format(self.session.api_user)
 
         self.session.event_hub.subscribe(
@@ -60,9 +62,9 @@ class AppAction(BaseAction):
         )
 
         launch_subscription = (
-            'topic=ftrack.action.launch'
-            ' and data.actionIdentifier={0}'
-            ' and source.user.username={1}'
+            "topic=ftrack.action.launch"
+            " and data.actionIdentifier={0}"
+            " and source.user.username={1}"
         ).format(
             self.identifier,
             self.session.api_user
@@ -73,33 +75,27 @@ class AppAction(BaseAction):
         )
 
     def discover(self, session, entities, event):
-        '''Return true if we can handle the selected entities.
+        """Return true if we can handle the selected entities.
 
-        *session* is a `ftrack_api.Session` instance
-
-        *entities* is a list of tuples each containing the entity type and
-        the entity id. If the entity is a hierarchical you will always get
-        the entity type TypedContext, once retrieved through a get operation
-        you will have the "real" entity type ie. example Shot, Sequence
-        or Asset Build.
-
-        *event* the unmodified original event
-
-        '''
+        Args:
+            session (ftrack_api.Session): Helps to query necessary data.
+            entities (list): Object of selected entities.
+            event (ftrack_api.Event): Ftrack event causing discover callback.
+        """
 
         if (
             len(entities) != 1 or
-            entities[0].entity_type.lower() != 'task'
+            entities[0].entity_type.lower() != "task"
         ):
             return False
 
-        if entities[0]['parent'].entity_type.lower() == 'project':
+        if entities[0]["parent"].entity_type.lower() == "project":
             return False
 
         ft_project = entities[0]['project']
 
         database = pypelib.get_avalon_database()
-        project_name = ft_project['full_name']
+        project_name = ft_project["full_name"]
         avalon_project = database[project_name].find_one({
             "type": "project"
         })
@@ -132,7 +128,7 @@ class AppAction(BaseAction):
         return self._handle_result(response)
 
     def launch(self, session, entities, event):
-        '''Callback method for the custom action.
+        """Callback method for the custom action.
 
         return either a bool (True if successful or False if the action failed)
         or a dictionary with they keys `message` and `success`, the message
@@ -149,8 +145,7 @@ class AppAction(BaseAction):
         or Asset Build.
 
         *event* the unmodified original event
-
-        '''
+        """
 
         entity = entities[0]
         project_name = entity['project']['full_name']
@@ -159,12 +154,12 @@ class AppAction(BaseAction):
 
         # Get current environments
         env_list = [
-            'AVALON_PROJECT',
-            'AVALON_SILO',
-            'AVALON_ASSET',
-            'AVALON_TASK',
-            'AVALON_APP',
-            'AVALON_APP_NAME'
+            "AVALON_PROJECT",
+            "AVALON_SILO",
+            "AVALON_ASSET",
+            "AVALON_TASK",
+            "AVALON_APP",
+            "AVALON_APP_NAME"
         ]
         env_origin = {}
         for env in env_list:
@@ -172,13 +167,13 @@ class AppAction(BaseAction):
 
         # set environments for Avalon
         os.environ["AVALON_PROJECT"] = project_name
-        os.environ["AVALON_SILO"] = entity['ancestors'][0]['name']
-        os.environ["AVALON_ASSET"] = entity['parent']['name']
-        os.environ["AVALON_TASK"] = entity['name']
+        os.environ["AVALON_SILO"] = entity["ancestors"][0]["name"]
+        os.environ["AVALON_ASSET"] = entity["parent"]["name"]
+        os.environ["AVALON_TASK"] = entity["name"]
         os.environ["AVALON_APP"] = self.identifier.split("_")[0]
         os.environ["AVALON_APP_NAME"] = self.identifier
 
-        anatomy = Anatomy()
+        anatomy = Anatomy(project_name)
 
         hierarchy = ""
         parents = database[project_name].find_one({

From ce5134493de2ccd85bd0a23a1507b2f40b99053d Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 19:23:41 +0200
Subject: [PATCH 16/22] move super call to skip label validations

---
 pype/ftrack/lib/ftrack_app_handler.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_app_handler.py b/pype/ftrack/lib/ftrack_app_handler.py
index f11153e70e..cfb983933b 100644
--- a/pype/ftrack/lib/ftrack_app_handler.py
+++ b/pype/ftrack/lib/ftrack_app_handler.py
@@ -30,9 +30,6 @@ class AppAction(BaseAction):
         self, session, label, name, executable, variant=None,
         icon=None, description=None, preactions=[], plugins_presets={}
     ):
-        super().__init__(session, plugins_presets)
-        """Expects a ftrack_api.Session instance"""
-
         self.label = label
         self.identifier = name
         self.executable = executable
@@ -41,6 +38,7 @@ class AppAction(BaseAction):
         self.description = description
         self.preactions.extend(preactions)
 
+        super().__init__(session, plugins_presets)
         if label is None:
             raise ValueError("Action missing label.")
         if name is None:

From 555d538dbe34598ae6c036e1ae28664770c61557 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 19:25:11 +0200
Subject: [PATCH 17/22] fix exception raise on launch

---
 pype/ftrack/lib/ftrack_action_handler.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_action_handler.py b/pype/ftrack/lib/ftrack_action_handler.py
index 3c0e55757b..66d321316f 100644
--- a/pype/ftrack/lib/ftrack_action_handler.py
+++ b/pype/ftrack/lib/ftrack_action_handler.py
@@ -177,8 +177,7 @@ class BaseAction(BaseHandler):
             else:
                 for key in ('success', 'message'):
                     if key not in result:
-                        continue
-                    raise KeyError('Missing required key: {0}.'.format(key))
+                        raise KeyError('Missing required key: {0}.'.format(key))
             return result
 
         self.log.warning((

From 047ace2e7fce6b195c50dab79c4c0a2c2496d769 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 19:48:21 +0200
Subject: [PATCH 18/22] enhanced get project entity to not query when not
 necessary

---
 pype/ftrack/lib/ftrack_base_handler.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py
index 07fa35866e..09d4cfe621 100644
--- a/pype/ftrack/lib/ftrack_base_handler.py
+++ b/pype/ftrack/lib/ftrack_base_handler.py
@@ -553,11 +553,20 @@ class BaseHandler(object):
         if low_entity_type == "project":
             return entity
 
-        if low_entity_type == "reviewsession":
+        if "project" in entity:
+            # reviewsession, task(Task, Shot, Sequence,...)
             return entity["project"]
 
         if low_entity_type == "filecomponent":
             entity = entity["version"]
+            low_entity_type = entity.entity_type.lower()
+
+        if low_entity_type == "assetversion":
+            asset = entity["asset"]
+            if asset:
+                parent = asset["parent"]
+                if parent:
+                    return parent["project"]
 
         project_data = entity["link"][0]
         return self.session.query(

From 926d52950b58dc03bf83c4f79f0d10b496c4dc26 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 19:52:33 +0200
Subject: [PATCH 19/22] slightly modified formatting in app handler

---
 pype/ftrack/lib/ftrack_app_handler.py | 49 +++++++++++++--------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_app_handler.py b/pype/ftrack/lib/ftrack_app_handler.py
index cfb983933b..53a52b1ff9 100644
--- a/pype/ftrack/lib/ftrack_app_handler.py
+++ b/pype/ftrack/lib/ftrack_app_handler.py
@@ -87,28 +87,25 @@ class AppAction(BaseAction):
         ):
             return False
 
-        if entities[0]["parent"].entity_type.lower() == "project":
+        entity = entities[0]
+        if entity["parent"].entity_type.lower() == "project":
             return False
 
-        ft_project = entities[0]['project']
-
+        ft_project = self.get_project_from_entity(entity)
         database = pypelib.get_avalon_database()
         project_name = ft_project["full_name"]
         avalon_project = database[project_name].find_one({
             "type": "project"
         })
 
-        if avalon_project is None:
+        if not avalon_project:
             return False
-        else:
-            apps = [app['name'] for app in avalon_project['config'].get(
-                'apps', []
-            )]
 
-            if self.identifier not in apps:
-                return False
-
-        return True
+        project_apps = avalon_project["config"].get("apps", [])
+        apps = [app["name"] for app in project_apps]
+        if self.identifier in apps:
+            return True
+        return False
 
     def _launch(self, event):
         entities = self._translate_event(event)
@@ -119,9 +116,7 @@ class AppAction(BaseAction):
         if preactions_launched is False:
             return
 
-        response = self.launch(
-            self.session, entities, event
-        )
+        response = self.launch(self.session, entities, event)
 
         return self._handle_result(response)
 
@@ -146,7 +141,8 @@ class AppAction(BaseAction):
         """
 
         entity = entities[0]
-        project_name = entity['project']['full_name']
+        ft_project = self.get_project_from_entity(entity)
+        project_name = ft_project["full_name"]
 
         database = pypelib.get_avalon_database()
 
@@ -173,12 +169,13 @@ class AppAction(BaseAction):
 
         anatomy = Anatomy(project_name)
 
-        hierarchy = ""
-        parents = database[project_name].find_one({
-            "type": 'asset',
-            "name": entity['parent']['name']
-        })['data']['parents']
+        asset_doc = database[project_name].find_one({
+            "type": "asset",
+            "name": entity["parent"]["name"]
+        })
+        parents = asset_doc["data"]["parents"]
 
+        hierarchy = ""
         if parents:
             hierarchy = os.path.join(*parents)
 
@@ -189,13 +186,13 @@ class AppAction(BaseAction):
         data = {
             "root": os.environ.get("PYPE_STUDIO_PROJECTS_MOUNT"),
             "project": {
-                "name": entity['project']['full_name'],
-                "code": entity['project']['name']
+                "name": ft_project["full_name"],
+                "code": ft_project["name"]
             },
-            "task": entity['name'],
-            "asset": entity['parent']['name'],
+            "task": entity["name"],
+            "asset": entity["parent"]["name"],
             "app": application["application_dir"],
-            "hierarchy": hierarchy,
+            "hierarchy": hierarchy
         }
 
         av_project = database[project_name].find_one({"type": 'project'})

From fef534e01489e6ca407c1ff85fe3d2e47a756fe3 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 20:10:49 +0200
Subject: [PATCH 20/22] removed lib.py from ftrack lib because one method is
 duplicated and second is used only in one action

---
 .../action_store_thumbnails_to_avalon.py      | 123 +++++++++++++++-
 pype/ftrack/lib/__init__.py                   |   5 -
 pype/ftrack/lib/lib.py                        | 135 ------------------
 3 files changed, 117 insertions(+), 146 deletions(-)
 delete mode 100644 pype/ftrack/lib/lib.py

diff --git a/pype/ftrack/actions/action_store_thumbnails_to_avalon.py b/pype/ftrack/actions/action_store_thumbnails_to_avalon.py
index 7adc36f4b5..6df695a9f0 100644
--- a/pype/ftrack/actions/action_store_thumbnails_to_avalon.py
+++ b/pype/ftrack/actions/action_store_thumbnails_to_avalon.py
@@ -5,13 +5,11 @@ import json
 
 from bson.objectid import ObjectId
 from pype.ftrack import BaseAction
-from pype.ftrack.lib import (
-    get_project_from_entity,
-    get_avalon_entities_for_assetversion
-)
 from pypeapp import Anatomy
 from pype.ftrack.lib.io_nonsingleton import DbConnector
 
+from pype.ftrack.lib.avalon_sync import CustAttrIdKey
+
 
 class StoreThumbnailsToAvalon(BaseAction):
     # Action identifier
@@ -89,7 +87,7 @@ class StoreThumbnailsToAvalon(BaseAction):
                 "message": msg
             }
 
-        project = get_project_from_entity(entities[0])
+        project = self.get_project_from_entity(entities[0])
         project_name = project["full_name"]
         anatomy = Anatomy(project_name)
 
@@ -186,7 +184,7 @@ class StoreThumbnailsToAvalon(BaseAction):
                 ).format(entity["id"]))
                 continue
 
-            avalon_ents_result = get_avalon_entities_for_assetversion(
+            avalon_ents_result = self.get_avalon_entities_for_assetversion(
                 entity, self.db_con
             )
             version_full_path = (
@@ -345,6 +343,119 @@ class StoreThumbnailsToAvalon(BaseAction):
             file_open.close()
         return True
 
+    def get_avalon_entities_for_assetversion(self, asset_version, db_con):
+        output = {
+            "success": True,
+            "message": None,
+            "project": None,
+            "project_name": None,
+            "asset": None,
+            "asset_name": None,
+            "asset_path": None,
+            "subset": None,
+            "subset_name": None,
+            "version": None,
+            "version_name": None,
+            "representations": None
+        }
+
+        db_con.install()
+
+        ft_asset = asset_version["asset"]
+        subset_name = ft_asset["name"]
+        version = asset_version["version"]
+        parent = ft_asset["parent"]
+        ent_path = "/".join(
+            [ent["name"] for ent in parent["link"]]
+        )
+        project = self.get_project_from_entity(asset_version)
+        project_name = project["full_name"]
+
+        output["project_name"] = project_name
+        output["asset_name"] = parent["name"]
+        output["asset_path"] = ent_path
+        output["subset_name"] = subset_name
+        output["version_name"] = version
+
+        db_con.Session["AVALON_PROJECT"] = project_name
+
+        avalon_project = db_con.find_one({"type": "project"})
+        output["project"] = avalon_project
+
+        if not avalon_project:
+            output["success"] = False
+            output["message"] = "Project not synchronized to avalon `{}`".format(
+                project_name
+            )
+            return output
+
+        asset_ent = None
+        asset_mongo_id = parent["custom_attributes"].get(CustAttrIdKey)
+        if asset_mongo_id:
+            try:
+                asset_mongo_id = ObjectId(asset_mongo_id)
+                asset_ent = db_con.find_one({
+                    "type": "asset",
+                    "_id": asset_mongo_id
+                })
+            except Exception:
+                pass
+
+        if not asset_ent:
+            asset_ent = db_con.find_one({
+                "type": "asset",
+                "data.ftrackId": parent["id"]
+            })
+
+        output["asset"] = asset_ent
+
+        if not asset_ent:
+            output["success"] = False
+            output["message"] = "Not synchronized entity to avalon `{}`".format(
+                ent_path
+            )
+            return output
+
+        asset_mongo_id = asset_ent["_id"]
+
+        subset_ent = db_con.find_one({
+            "type": "subset",
+            "parent": asset_mongo_id,
+            "name": subset_name
+        })
+
+        output["subset"] = subset_ent
+
+        if not subset_ent:
+            output["success"] = False
+            output["message"] = (
+                "Subset `{}` does not exist under Asset `{}`"
+            ).format(subset_name, ent_path)
+            return output
+
+        version_ent = db_con.find_one({
+            "type": "version",
+            "name": version,
+            "parent": subset_ent["_id"]
+        })
+
+        output["version"] = version_ent
+
+        if not version_ent:
+            output["success"] = False
+            output["message"] = (
+                "Version `{}` does not exist under Subset `{}` | Asset `{}`"
+            ).format(version, subset_name, ent_path)
+            return output
+
+        repre_ents = list(db_con.find({
+            "type": "representation",
+            "parent": version_ent["_id"]
+        }))
+
+        output["representations"] = repre_ents
+        return output
+
 
 def register(session, plugins_presets={}):
     StoreThumbnailsToAvalon(session, plugins_presets).register()
diff --git a/pype/ftrack/lib/__init__.py b/pype/ftrack/lib/__init__.py
index 692461de87..c56b744f87 100644
--- a/pype/ftrack/lib/__init__.py
+++ b/pype/ftrack/lib/__init__.py
@@ -4,8 +4,3 @@ from .ftrack_base_handler import BaseHandler
 from .ftrack_event_handler import BaseEvent
 from .ftrack_action_handler import BaseAction
 from .ftrack_app_handler import AppAction
-
-from .lib import (
-    get_project_from_entity,
-    get_avalon_entities_for_assetversion
-)
diff --git a/pype/ftrack/lib/lib.py b/pype/ftrack/lib/lib.py
deleted file mode 100644
index aee297fc7e..0000000000
--- a/pype/ftrack/lib/lib.py
+++ /dev/null
@@ -1,135 +0,0 @@
-from bson.objectid import ObjectId
-
-from .avalon_sync import CustAttrIdKey
-import avalon.io
-
-
-def get_project_from_entity(entity):
-    # TODO add more entities
-    ent_type_lowered = entity.entity_type.lower()
-    if ent_type_lowered == "project":
-        return entity
-
-    elif ent_type_lowered == "assetversion":
-        return entity["asset"]["parent"]["project"]
-
-    elif "project" in entity:
-        return entity["project"]
-
-    return None
-
-
-def get_avalon_entities_for_assetversion(asset_version, db_con=None):
-    output = {
-        "success": True,
-        "message": None,
-        "project": None,
-        "project_name": None,
-        "asset": None,
-        "asset_name": None,
-        "asset_path": None,
-        "subset": None,
-        "subset_name": None,
-        "version": None,
-        "version_name": None,
-        "representations": None
-    }
-
-    if db_con is None:
-        db_con = avalon.io
-    db_con.install()
-
-    ft_asset = asset_version["asset"]
-    subset_name = ft_asset["name"]
-    version = asset_version["version"]
-    parent = ft_asset["parent"]
-    ent_path = "/".join(
-        [ent["name"] for ent in parent["link"]]
-    )
-    project = get_project_from_entity(asset_version)
-    project_name = project["full_name"]
-
-    output["project_name"] = project_name
-    output["asset_name"] = parent["name"]
-    output["asset_path"] = ent_path
-    output["subset_name"] = subset_name
-    output["version_name"] = version
-
-    db_con.Session["AVALON_PROJECT"] = project_name
-
-    avalon_project = db_con.find_one({"type": "project"})
-    output["project"] = avalon_project
-
-    if not avalon_project:
-        output["success"] = False
-        output["message"] = "Project not synchronized to avalon `{}`".format(
-            project_name
-        )
-        return output
-
-    asset_ent = None
-    asset_mongo_id = parent["custom_attributes"].get(CustAttrIdKey)
-    if asset_mongo_id:
-        try:
-            asset_mongo_id = ObjectId(asset_mongo_id)
-            asset_ent = db_con.find_one({
-                "type": "asset",
-                "_id": asset_mongo_id
-            })
-        except Exception:
-            pass
-
-    if not asset_ent:
-        asset_ent = db_con.find_one({
-            "type": "asset",
-            "data.ftrackId": parent["id"]
-        })
-
-    output["asset"] = asset_ent
-
-    if not asset_ent:
-        output["success"] = False
-        output["message"] = "Not synchronized entity to avalon `{}`".format(
-            ent_path
-        )
-        return output
-
-    asset_mongo_id = asset_ent["_id"]
-
-    subset_ent = db_con.find_one({
-        "type": "subset",
-        "parent": asset_mongo_id,
-        "name": subset_name
-    })
-
-    output["subset"] = subset_ent
-
-    if not subset_ent:
-        output["success"] = False
-        output["message"] = (
-            "Subset `{}` does not exist under Asset `{}`"
-        ).format(subset_name, ent_path)
-        return output
-
-    version_ent = db_con.find_one({
-        "type": "version",
-        "name": version,
-        "parent": subset_ent["_id"]
-    })
-
-    output["version"] = version_ent
-
-    if not version_ent:
-        output["success"] = False
-        output["message"] = (
-            "Version `{}` does not exist under Subset `{}` | Asset `{}`"
-        ).format(version, subset_name, ent_path)
-        return output
-
-    repre_ents = list(db_con.find({
-        "type": "representation",
-        "parent": version_ent["_id"]
-    }))
-
-    output["representations"] = repre_ents
-    return output

From aa17248649d5591cce551043c833a90924011673 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 20:11:39 +0200
Subject: [PATCH 21/22] ftrack/lib/__init__ has __all__ now

---
 pype/ftrack/lib/__init__.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pype/ftrack/lib/__init__.py b/pype/ftrack/lib/__init__.py
index c56b744f87..e58804440a 100644
--- a/pype/ftrack/lib/__init__.py
+++ b/pype/ftrack/lib/__init__.py
@@ -4,3 +4,12 @@ from .ftrack_base_handler import BaseHandler
 from .ftrack_event_handler import BaseEvent
 from .ftrack_action_handler import BaseAction
 from .ftrack_app_handler import AppAction
+
+__all__ = [
+    "avalon_sync",
+    "credentials",
+    "BaseHandler",
+    "BaseEvent",
+    "BaseAction",
+    "AppAction"
+]

From 704df56814123f637bac8011d8fc64cce2665b57 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Tue, 21 Apr 2020 10:24:17 +0200
Subject: [PATCH 22/22] fixed too long strings in store_thumbnails_to_avalon
 action

---
 pype/ftrack/actions/action_store_thumbnails_to_avalon.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pype/ftrack/actions/action_store_thumbnails_to_avalon.py b/pype/ftrack/actions/action_store_thumbnails_to_avalon.py
index 6df695a9f0..051156c2f8 100644
--- a/pype/ftrack/actions/action_store_thumbnails_to_avalon.py
+++ b/pype/ftrack/actions/action_store_thumbnails_to_avalon.py
@@ -384,8 +384,8 @@ class StoreThumbnailsToAvalon(BaseAction):
 
         if not avalon_project:
             output["success"] = False
-            output["message"] = "Project not synchronized to avalon `{}`".format(
-                project_name
+            output["message"] = (
+                "Project not synchronized to avalon `{}`".format(project_name)
             )
             return output
 
@@ -411,8 +411,8 @@ class StoreThumbnailsToAvalon(BaseAction):
 
         if not asset_ent:
             output["success"] = False
-            output["message"] = "Not synchronized entity to avalon `{}`".format(
-                ent_path
+            output["message"] = (
+                "Not synchronized entity to avalon `{}`".format(ent_path)
             )
             return output