Merge pull request #2049 from pypeclub/feature/ftrack_without_interface

Ftrack: Removed ftrack interface

openpype/modules/default_modules/clockify/clockify_module.py

@@ -10,16 +10,14 @@ from .constants import (
 from openpype.modules import OpenPypeModule
 from openpype_interfaces import (
     ITrayModule,
-    IPluginPaths,
-    IFtrackEventHandlerPaths
+    IPluginPaths
 )
 
 
 class ClockifyModule(
     OpenPypeModule,
     ITrayModule,
-    IPluginPaths,
-    IFtrackEventHandlerPaths
+    IPluginPaths
 ):
     name = "clockify"
 
@@ -93,8 +91,8 @@ class ClockifyModule(
             "actions": [actions_path]
         }
 
-    def get_event_handler_paths(self):
-        """Implementaton of IFtrackEventHandlerPaths to get plugin paths."""
+    def get_ftrack_event_handler_paths(self):
+        """Function for Ftrack module to add ftrack event handler paths."""
         return {
             "user": [CLOCKIFY_FTRACK_USER_PATH],
             "server": [CLOCKIFY_FTRACK_SERVER_PATH]

openpype/modules/default_modules/ftrack/ftrack_module.py

@@ -8,8 +8,7 @@ from openpype_interfaces import (
     ITrayModule,
     IPluginPaths,
     ILaunchHookPaths,
-    ISettingsChangeListener,
-    IFtrackEventHandlerPaths
+    ISettingsChangeListener
 )
 from openpype.settings import SaveWarningExc
 
@@ -81,9 +80,17 @@ class FtrackModule(
 
     def connect_with_modules(self, enabled_modules):
         for module in enabled_modules:
-            if not isinstance(module, IFtrackEventHandlerPaths):
+            if not hasattr(module, "get_ftrack_event_handler_paths"):
                 continue
-            paths_by_type = module.get_event_handler_paths() or {}
+
+            try:
+                paths_by_type = module.get_ftrack_event_handler_paths()
+            except Exception:
+                continue
+
+            if not isinstance(paths_by_type, dict):
+                continue
+
             for key, value in paths_by_type.items():
                 if not value:
                     continue

openpype/modules/default_modules/ftrack/interfaces.py

@@ -1,12 +0,0 @@
-from abc import abstractmethod
-from openpype.modules import OpenPypeInterface
-
-
-class IFtrackEventHandlerPaths(OpenPypeInterface):
-    """Other modules interface to return paths to ftrack event handlers.
-
-    Expected output is dictionary with "server" and "user" keys.
-    """
-    @abstractmethod
-    def get_event_handler_paths(self):
-        pass

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

@@ -5,8 +5,7 @@ from .constants import (
     CUST_ATTR_TOOLS,
     CUST_ATTR_APPLICATIONS
 )
-from . settings import (
-    get_ftrack_url_from_settings,
+from .settings import (
     get_ftrack_event_mongo_info
 )
 from .custom_attributes import (
@@ -31,7 +30,6 @@ __all__ = (
     "CUST_ATTR_TOOLS",
     "CUST_ATTR_APPLICATIONS",
 
-    "get_ftrack_url_from_settings",
     "get_ftrack_event_mongo_info",
 
     "default_custom_attributes_definition",

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

@@ -1,13 +1,4 @@
 import os
-from openpype.api import get_system_settings
-
-
-def get_ftrack_settings():
-    return get_system_settings()["modules"]["ftrack"]
-
-
-def get_ftrack_url_from_settings():
-    return get_ftrack_settings()["ftrack_server"]
 
 
 def get_ftrack_event_mongo_info():