From 30ee358fc1e7b127981fcf4c1e897e7dc65a0de7 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 20 Sep 2022 01:29:01 +0200
Subject: [PATCH] Move `get_current_comp` and `comp_lock_and_undo_chunk` to
 `lib`

+ fix import of host tools
---
 openpype/hosts/fusion/api/__init__.py | 14 ++++++--------
 openpype/hosts/fusion/api/lib.py      | 20 ++++++++++++++++++--
 openpype/hosts/fusion/api/pipeline.py | 22 ++++++----------------
 openpype/hosts/fusion/api/workio.py   |  2 +-
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/openpype/hosts/fusion/api/__init__.py b/openpype/hosts/fusion/api/__init__.py
index e5a7dac8c8..45ed4e12a3 100644
--- a/openpype/hosts/fusion/api/__init__.py
+++ b/openpype/hosts/fusion/api/__init__.py
@@ -5,10 +5,7 @@ from .pipeline import (
     ls,
 
     imprint_container,
-    parse_container,
-
-    get_current_comp,
-    comp_lock_and_undo_chunk
+    parse_container
 )
 
 from .workio import (
@@ -24,7 +21,9 @@ from .lib import (
     maintained_selection,
     get_additional_data,
     update_frame_range,
-    set_asset_framerange
+    set_asset_framerange,
+    get_current_comp,
+    comp_lock_and_undo_chunk
 )
 
 from .menu import launch_openpype_menu
@@ -39,9 +38,6 @@ __all__ = [
     "imprint_container",
     "parse_container",
 
-    "get_current_comp",
-    "comp_lock_and_undo_chunk",
-
     # workio
     "open_file",
     "save_file",
@@ -55,6 +51,8 @@ __all__ = [
     "get_additional_data",
     "update_frame_range",
     "set_asset_framerange",
+    "get_current_comp",
+    "comp_lock_and_undo_chunk",
 
     # menu
     "launch_openpype_menu",
diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py
index 91a74ac848..295ba33711 100644
--- a/openpype/hosts/fusion/api/lib.py
+++ b/openpype/hosts/fusion/api/lib.py
@@ -19,8 +19,6 @@ from openpype.pipeline import (
 )
 from openpype.pipeline.context_tools import get_current_project_asset
 
-from .pipeline import get_current_comp, comp_lock_and_undo_chunk
-
 self = sys.modules[__name__]
 self._project = None
 
@@ -232,3 +230,21 @@ def get_frame_path(path):
         padding = 4  # default Fusion padding
 
     return filename, padding, ext
+
+
+def get_current_comp():
+    """Hack to get current comp in this session"""
+    fusion = getattr(sys.modules["__main__"], "fusion", None)
+    return fusion.CurrentComp if fusion else None
+
+
+@contextlib.contextmanager
+def comp_lock_and_undo_chunk(comp, undo_queue_name="Script CMD"):
+    """Lock comp and open an undo chunk during the context"""
+    try:
+        comp.Lock()
+        comp.StartUndo(undo_queue_name)
+        yield
+    finally:
+        comp.Unlock()
+        comp.EndUndo()
\ No newline at end of file
diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py
index b5d461e7f0..82cae427ff 100644
--- a/openpype/hosts/fusion/api/pipeline.py
+++ b/openpype/hosts/fusion/api/pipeline.py
@@ -23,6 +23,12 @@ from openpype.pipeline import (
 )
 from openpype.pipeline.load import any_outdated_containers
 from openpype.hosts.fusion import FUSION_HOST_DIR
+from openpype.tools.utils import host_tools
+
+from .lib import (
+    get_current_comp,
+    comp_lock_and_undo_chunk
+)
 
 log = Logger.get_logger(__name__)
 
@@ -247,19 +253,3 @@ def parse_container(tool):
     return container
 
 
-def get_current_comp():
-    """Hack to get current comp in this session"""
-    fusion = getattr(sys.modules["__main__"], "fusion", None)
-    return fusion.CurrentComp if fusion else None
-
-
-@contextlib.contextmanager
-def comp_lock_and_undo_chunk(comp, undo_queue_name="Script CMD"):
-    """Lock comp and open an undo chunk during the context"""
-    try:
-        comp.Lock()
-        comp.StartUndo(undo_queue_name)
-        yield
-    finally:
-        comp.Unlock()
-        comp.EndUndo()
diff --git a/openpype/hosts/fusion/api/workio.py b/openpype/hosts/fusion/api/workio.py
index 89752d3e6d..939b2ff4be 100644
--- a/openpype/hosts/fusion/api/workio.py
+++ b/openpype/hosts/fusion/api/workio.py
@@ -2,7 +2,7 @@
 import sys
 import os
 
-from .pipeline import get_current_comp
+from .lib import get_current_comp
 
 
 def file_extensions():