use new import of 'check_ftrack_url'

openpype/modules/ftrack/ftrack_module.py

@@ -6,7 +6,7 @@ import platform
 import click
 
 from openpype.modules import OpenPypeModule
-from openpype_interfaces import (
+from openpype.modules.interfaces import (
     ITrayModule,
     IPluginPaths,
     ISettingsChangeListener

openpype/modules/ftrack/ftrack_server/__init__.py

@@ -1,8 +1,6 @@
 from .ftrack_server import FtrackServer
-from .lib import check_ftrack_url
 
 
 __all__ = (
     "FtrackServer",
-    "check_ftrack_url"
 )

openpype/modules/ftrack/ftrack_server/event_server_cli.py

@@ -20,9 +20,11 @@ from openpype.lib import (
     get_openpype_version,
     get_build_version,
 )
-from openpype_modules.ftrack import FTRACK_MODULE_DIR
+from openpype_modules.ftrack import (
+    FTRACK_MODULE_DIR,
+    check_ftrack_url,
+)
 from openpype_modules.ftrack.lib import credentials
-from openpype_modules.ftrack.ftrack_server.lib import check_ftrack_url
 from openpype_modules.ftrack.ftrack_server import socket_thread
 
 

openpype/modules/ftrack/ftrack_server/lib.py

@@ -26,45 +26,12 @@ except ImportError:
 from openpype_modules.ftrack.lib import get_ftrack_event_mongo_info
 
 from openpype.client import OpenPypeMongoConnection
-from openpype.api import Logger
+from openpype.lib import Logger
 
 TOPIC_STATUS_SERVER = "openpype.event.server.status"
 TOPIC_STATUS_SERVER_RESULT = "openpype.event.server.status.result"
 
 
-def check_ftrack_url(url, log_errors=True, logger=None):
-    """Checks if Ftrack server is responding"""
-    if logger is None:
-        logger = Logger.get_logger(__name__)
-
-    if not url:
-        logger.error("Ftrack URL is not set!")
-        return None
-
-    url = url.strip('/ ')
-
-    if 'http' not in url:
-        if url.endswith('ftrackapp.com'):
-            url = 'https://' + url
-        else:
-            url = 'https://{0}.ftrackapp.com'.format(url)
-    try:
-        result = requests.get(url, allow_redirects=False)
-    except requests.exceptions.RequestException:
-        if log_errors:
-            logger.error("Entered Ftrack URL is not accesible!")
-        return False
-
-    if (result.status_code != 200 or 'FTRACK_VERSION' not in result.headers):
-        if log_errors:
-            logger.error("Entered Ftrack URL is not accesible!")
-        return False
-
-    logger.debug("Ftrack server {} is accessible.".format(url))
-
-    return url
-
-
 class SocketBaseEventHub(ftrack_api.event.hub.EventHub):
 
     hearbeat_msg = b"hearbeat"

openpype/modules/ftrack/lib/avalon_sync.py

@@ -19,11 +19,8 @@ from openpype.client.operations import (
     CURRENT_PROJECT_SCHEMA,
     CURRENT_PROJECT_CONFIG_SCHEMA,
 )
-from openpype.api import (
-    Logger,
-    get_anatomy_settings
-)
-from openpype.lib import ApplicationManager
+from openpype.settings import get_anatomy_settings
+from openpype.lib import ApplicationManager, Logger
 from openpype.pipeline import AvalonMongoDB, schema
 
 from .constants import CUST_ATTR_ID_KEY, FPS_KEYS