From 438f1301b6b9218751b5e1d049c251eb9309f9f9 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 31 May 2024 11:12:03 +0200 Subject: [PATCH 1/7] move fusion next to server codebase --- .../fusion => server_addon/fusion/client/ayon_fusion}/__init__.py | 0 .../fusion => server_addon/fusion/client/ayon_fusion}/addon.py | 0 .../fusion/client/ayon_fusion}/api/__init__.py | 0 .../fusion/client/ayon_fusion}/api/action.py | 0 .../fusion => server_addon/fusion/client/ayon_fusion}/api/lib.py | 0 .../fusion => server_addon/fusion/client/ayon_fusion}/api/menu.py | 0 .../fusion/client/ayon_fusion}/api/pipeline.py | 0 .../fusion/client/ayon_fusion}/api/plugin.py | 0 .../fusion/client/ayon_fusion}/api/pulse.py | 0 .../fusion/client/ayon_fusion}/deploy/MenuScripts/README.md | 0 .../client/ayon_fusion}/deploy/MenuScripts/install_pyside2.py | 0 .../fusion/client/ayon_fusion}/deploy/MenuScripts/launch_menu.py | 0 .../fusion/client/ayon_fusion}/deploy/ayon/Config/menu.fu | 0 .../fusion/client/ayon_fusion}/deploy/ayon/fusion_shared.prefs | 0 .../client/ayon_fusion}/hooks/pre_fusion_launch_menu_hook.py | 0 .../fusion/client/ayon_fusion}/hooks/pre_fusion_profile_hook.py | 0 .../fusion/client/ayon_fusion}/hooks/pre_fusion_setup.py | 0 .../fusion/client/ayon_fusion}/hooks/pre_pyside_install.py | 0 .../client/ayon_fusion}/plugins/create/create_image_saver.py | 0 .../fusion/client/ayon_fusion}/plugins/create/create_saver.py | 0 .../fusion/client/ayon_fusion}/plugins/create/create_workfile.py | 0 .../client/ayon_fusion}/plugins/inventory/select_containers.py | 0 .../client/ayon_fusion}/plugins/inventory/set_tool_color.py | 0 .../fusion/client/ayon_fusion}/plugins/load/actions.py | 0 .../fusion/client/ayon_fusion}/plugins/load/load_alembic.py | 0 .../fusion/client/ayon_fusion}/plugins/load/load_fbx.py | 0 .../fusion/client/ayon_fusion}/plugins/load/load_sequence.py | 0 .../fusion/client/ayon_fusion}/plugins/load/load_usd.py | 0 .../fusion/client/ayon_fusion}/plugins/load/load_workfile.py | 0 .../fusion/client/ayon_fusion}/plugins/publish/collect_comp.py | 0 .../ayon_fusion}/plugins/publish/collect_comp_frame_range.py | 0 .../fusion/client/ayon_fusion}/plugins/publish/collect_inputs.py | 0 .../client/ayon_fusion}/plugins/publish/collect_instances.py | 0 .../fusion/client/ayon_fusion}/plugins/publish/collect_render.py | 0 .../client/ayon_fusion}/plugins/publish/collect_workfile.py | 0 .../client/ayon_fusion}/plugins/publish/extract_render_local.py | 0 .../client/ayon_fusion}/plugins/publish/increment_current_file.py | 0 .../fusion/client/ayon_fusion}/plugins/publish/save_scene.py | 0 .../ayon_fusion}/plugins/publish/validate_background_depth.py | 0 .../client/ayon_fusion}/plugins/publish/validate_comp_saved.py | 0 .../plugins/publish/validate_create_folder_checked.py | 0 .../plugins/publish/validate_expected_frames_existence.py | 0 .../plugins/publish/validate_filename_has_extension.py | 0 .../client/ayon_fusion}/plugins/publish/validate_image_frame.py | 0 .../ayon_fusion}/plugins/publish/validate_instance_frame_range.py | 0 .../ayon_fusion}/plugins/publish/validate_instance_in_context.py | 0 .../ayon_fusion}/plugins/publish/validate_saver_has_input.py | 0 .../ayon_fusion}/plugins/publish/validate_saver_passthrough.py | 0 .../ayon_fusion}/plugins/publish/validate_saver_resolution.py | 0 .../ayon_fusion}/plugins/publish/validate_unique_subsets.py | 0 .../fusion/client/ayon_fusion}/scripts/__init__.py | 0 .../fusion/client/ayon_fusion}/scripts/duplicate_with_inputs.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/__init__.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/__init__.pyi | 0 .../fusion/client/ayon_fusion}/vendor/attr/_cmp.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/_cmp.pyi | 0 .../fusion/client/ayon_fusion}/vendor/attr/_compat.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/_config.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/_funcs.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/_make.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/_next_gen.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/_version_info.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/_version_info.pyi | 0 .../fusion/client/ayon_fusion}/vendor/attr/converters.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/converters.pyi | 0 .../fusion/client/ayon_fusion}/vendor/attr/exceptions.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/exceptions.pyi | 0 .../fusion/client/ayon_fusion}/vendor/attr/filters.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/filters.pyi | 0 .../fusion/client/ayon_fusion}/vendor/attr/py.typed | 0 .../fusion/client/ayon_fusion}/vendor/attr/setters.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/setters.pyi | 0 .../fusion/client/ayon_fusion}/vendor/attr/validators.py | 0 .../fusion/client/ayon_fusion}/vendor/attr/validators.pyi | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/__init__.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/_collections.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/_version.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/connection.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/connectionpool.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/contrib/__init__.py | 0 .../ayon_fusion}/vendor/urllib3/contrib/_appengine_environ.py | 0 .../vendor/urllib3/contrib/_securetransport/__init__.py | 0 .../vendor/urllib3/contrib/_securetransport/bindings.py | 0 .../vendor/urllib3/contrib/_securetransport/low_level.py | 0 .../client/ayon_fusion}/vendor/urllib3/contrib/appengine.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/contrib/ntlmpool.py | 0 .../client/ayon_fusion}/vendor/urllib3/contrib/pyopenssl.py | 0 .../client/ayon_fusion}/vendor/urllib3/contrib/securetransport.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/contrib/socks.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/exceptions.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/fields.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/filepost.py | 0 .../client/ayon_fusion}/vendor/urllib3/packages/__init__.py | 0 .../ayon_fusion}/vendor/urllib3/packages/backports/__init__.py | 0 .../ayon_fusion}/vendor/urllib3/packages/backports/makefile.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/packages/six.py | 0 .../vendor/urllib3/packages/ssl_match_hostname/__init__.py | 0 .../vendor/urllib3/packages/ssl_match_hostname/_implementation.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/poolmanager.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/request.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/response.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/util/__init__.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/util/connection.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/util/proxy.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/util/queue.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/util/request.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/util/response.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/util/retry.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/util/ssl_.py | 0 .../client/ayon_fusion}/vendor/urllib3/util/ssltransport.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/util/timeout.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/util/url.py | 0 .../fusion/client/ayon_fusion}/vendor/urllib3/util/wait.py | 0 113 files changed, 0 insertions(+), 0 deletions(-) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/__init__.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/addon.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/api/__init__.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/api/action.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/api/lib.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/api/menu.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/api/pipeline.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/api/plugin.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/api/pulse.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/deploy/MenuScripts/README.md (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/deploy/MenuScripts/install_pyside2.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/deploy/MenuScripts/launch_menu.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/deploy/ayon/Config/menu.fu (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/deploy/ayon/fusion_shared.prefs (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/hooks/pre_fusion_launch_menu_hook.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/hooks/pre_fusion_profile_hook.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/hooks/pre_fusion_setup.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/hooks/pre_pyside_install.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/create/create_image_saver.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/create/create_saver.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/create/create_workfile.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/inventory/select_containers.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/inventory/set_tool_color.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/load/actions.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/load/load_alembic.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/load/load_fbx.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/load/load_sequence.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/load/load_usd.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/load/load_workfile.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/collect_comp.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/collect_comp_frame_range.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/collect_inputs.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/collect_instances.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/collect_render.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/collect_workfile.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/extract_render_local.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/increment_current_file.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/save_scene.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_background_depth.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_comp_saved.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_create_folder_checked.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_expected_frames_existence.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_filename_has_extension.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_image_frame.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_instance_frame_range.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_instance_in_context.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_saver_has_input.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_saver_passthrough.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_saver_resolution.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/plugins/publish/validate_unique_subsets.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/scripts/__init__.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/scripts/duplicate_with_inputs.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/__init__.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/__init__.pyi (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/_cmp.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/_cmp.pyi (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/_compat.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/_config.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/_funcs.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/_make.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/_next_gen.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/_version_info.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/_version_info.pyi (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/converters.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/converters.pyi (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/exceptions.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/exceptions.pyi (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/filters.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/filters.pyi (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/py.typed (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/setters.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/setters.pyi (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/validators.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/attr/validators.pyi (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/__init__.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/_collections.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/_version.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/connection.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/connectionpool.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/contrib/__init__.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/contrib/_appengine_environ.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/contrib/_securetransport/__init__.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/contrib/_securetransport/bindings.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/contrib/_securetransport/low_level.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/contrib/appengine.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/contrib/ntlmpool.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/contrib/pyopenssl.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/contrib/securetransport.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/contrib/socks.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/exceptions.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/fields.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/filepost.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/packages/__init__.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/packages/backports/__init__.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/packages/backports/makefile.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/packages/six.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/packages/ssl_match_hostname/__init__.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/packages/ssl_match_hostname/_implementation.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/poolmanager.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/request.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/response.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/__init__.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/connection.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/proxy.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/queue.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/request.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/response.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/retry.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/ssl_.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/ssltransport.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/timeout.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/url.py (100%) rename {client/ayon_core/hosts/fusion => server_addon/fusion/client/ayon_fusion}/vendor/urllib3/util/wait.py (100%) diff --git a/client/ayon_core/hosts/fusion/__init__.py b/server_addon/fusion/client/ayon_fusion/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/__init__.py rename to server_addon/fusion/client/ayon_fusion/__init__.py diff --git a/client/ayon_core/hosts/fusion/addon.py b/server_addon/fusion/client/ayon_fusion/addon.py similarity index 100% rename from client/ayon_core/hosts/fusion/addon.py rename to server_addon/fusion/client/ayon_fusion/addon.py diff --git a/client/ayon_core/hosts/fusion/api/__init__.py b/server_addon/fusion/client/ayon_fusion/api/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/api/__init__.py rename to server_addon/fusion/client/ayon_fusion/api/__init__.py diff --git a/client/ayon_core/hosts/fusion/api/action.py b/server_addon/fusion/client/ayon_fusion/api/action.py similarity index 100% rename from client/ayon_core/hosts/fusion/api/action.py rename to server_addon/fusion/client/ayon_fusion/api/action.py diff --git a/client/ayon_core/hosts/fusion/api/lib.py b/server_addon/fusion/client/ayon_fusion/api/lib.py similarity index 100% rename from client/ayon_core/hosts/fusion/api/lib.py rename to server_addon/fusion/client/ayon_fusion/api/lib.py diff --git a/client/ayon_core/hosts/fusion/api/menu.py b/server_addon/fusion/client/ayon_fusion/api/menu.py similarity index 100% rename from client/ayon_core/hosts/fusion/api/menu.py rename to server_addon/fusion/client/ayon_fusion/api/menu.py diff --git a/client/ayon_core/hosts/fusion/api/pipeline.py b/server_addon/fusion/client/ayon_fusion/api/pipeline.py similarity index 100% rename from client/ayon_core/hosts/fusion/api/pipeline.py rename to server_addon/fusion/client/ayon_fusion/api/pipeline.py diff --git a/client/ayon_core/hosts/fusion/api/plugin.py b/server_addon/fusion/client/ayon_fusion/api/plugin.py similarity index 100% rename from client/ayon_core/hosts/fusion/api/plugin.py rename to server_addon/fusion/client/ayon_fusion/api/plugin.py diff --git a/client/ayon_core/hosts/fusion/api/pulse.py b/server_addon/fusion/client/ayon_fusion/api/pulse.py similarity index 100% rename from client/ayon_core/hosts/fusion/api/pulse.py rename to server_addon/fusion/client/ayon_fusion/api/pulse.py diff --git a/client/ayon_core/hosts/fusion/deploy/MenuScripts/README.md b/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/README.md similarity index 100% rename from client/ayon_core/hosts/fusion/deploy/MenuScripts/README.md rename to server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/README.md diff --git a/client/ayon_core/hosts/fusion/deploy/MenuScripts/install_pyside2.py b/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/install_pyside2.py similarity index 100% rename from client/ayon_core/hosts/fusion/deploy/MenuScripts/install_pyside2.py rename to server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/install_pyside2.py diff --git a/client/ayon_core/hosts/fusion/deploy/MenuScripts/launch_menu.py b/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py similarity index 100% rename from client/ayon_core/hosts/fusion/deploy/MenuScripts/launch_menu.py rename to server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py diff --git a/client/ayon_core/hosts/fusion/deploy/ayon/Config/menu.fu b/server_addon/fusion/client/ayon_fusion/deploy/ayon/Config/menu.fu similarity index 100% rename from client/ayon_core/hosts/fusion/deploy/ayon/Config/menu.fu rename to server_addon/fusion/client/ayon_fusion/deploy/ayon/Config/menu.fu diff --git a/client/ayon_core/hosts/fusion/deploy/ayon/fusion_shared.prefs b/server_addon/fusion/client/ayon_fusion/deploy/ayon/fusion_shared.prefs similarity index 100% rename from client/ayon_core/hosts/fusion/deploy/ayon/fusion_shared.prefs rename to server_addon/fusion/client/ayon_fusion/deploy/ayon/fusion_shared.prefs diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py similarity index 100% rename from client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py rename to server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py similarity index 100% rename from client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py rename to server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py similarity index 100% rename from client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py rename to server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py diff --git a/client/ayon_core/hosts/fusion/hooks/pre_pyside_install.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_pyside_install.py similarity index 100% rename from client/ayon_core/hosts/fusion/hooks/pre_pyside_install.py rename to server_addon/fusion/client/ayon_fusion/hooks/pre_pyside_install.py diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py b/server_addon/fusion/client/ayon_fusion/plugins/create/create_image_saver.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py rename to server_addon/fusion/client/ayon_fusion/plugins/create/create_image_saver.py diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_saver.py b/server_addon/fusion/client/ayon_fusion/plugins/create/create_saver.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/create/create_saver.py rename to server_addon/fusion/client/ayon_fusion/plugins/create/create_saver.py diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_workfile.py b/server_addon/fusion/client/ayon_fusion/plugins/create/create_workfile.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/create/create_workfile.py rename to server_addon/fusion/client/ayon_fusion/plugins/create/create_workfile.py diff --git a/client/ayon_core/hosts/fusion/plugins/inventory/select_containers.py b/server_addon/fusion/client/ayon_fusion/plugins/inventory/select_containers.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/inventory/select_containers.py rename to server_addon/fusion/client/ayon_fusion/plugins/inventory/select_containers.py diff --git a/client/ayon_core/hosts/fusion/plugins/inventory/set_tool_color.py b/server_addon/fusion/client/ayon_fusion/plugins/inventory/set_tool_color.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/inventory/set_tool_color.py rename to server_addon/fusion/client/ayon_fusion/plugins/inventory/set_tool_color.py diff --git a/client/ayon_core/hosts/fusion/plugins/load/actions.py b/server_addon/fusion/client/ayon_fusion/plugins/load/actions.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/load/actions.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/actions.py diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_alembic.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_alembic.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/load/load_alembic.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/load_alembic.py diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_fbx.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_fbx.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/load/load_fbx.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/load_fbx.py diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_sequence.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_sequence.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/load/load_sequence.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/load_sequence.py diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_usd.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_usd.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/load/load_usd.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/load_usd.py diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_workfile.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_workfile.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/load/load_workfile.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/load_workfile.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_comp.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_comp.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_comp_frame_range.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp_frame_range.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_comp_frame_range.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp_frame_range.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_inputs.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_inputs.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_inputs.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_inputs.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_instances.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_instances.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_instances.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_instances.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_render.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_render.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_render.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_workfile.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_workfile.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_workfile.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_workfile.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/extract_render_local.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/extract_render_local.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/increment_current_file.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/increment_current_file.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/increment_current_file.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/increment_current_file.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/save_scene.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/save_scene.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/save_scene.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/save_scene.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_background_depth.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_background_depth.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_background_depth.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_background_depth.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_comp_saved.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_comp_saved.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_comp_saved.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_comp_saved.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_create_folder_checked.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_create_folder_checked.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_create_folder_checked.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_create_folder_checked.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_expected_frames_existence.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_expected_frames_existence.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_expected_frames_existence.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_expected_frames_existence.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_filename_has_extension.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_filename_has_extension.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_filename_has_extension.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_filename_has_extension.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_image_frame.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_image_frame.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_image_frame.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_image_frame.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_frame_range.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_frame_range.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_instance_frame_range.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_frame_range.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_in_context.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_in_context.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_instance_in_context.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_in_context.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_has_input.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_has_input.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_saver_has_input.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_has_input.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_passthrough.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_passthrough.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_saver_passthrough.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_passthrough.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_resolution.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_resolution.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_saver_resolution.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_resolution.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_unique_subsets.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_unique_subsets.py diff --git a/client/ayon_core/hosts/fusion/scripts/__init__.py b/server_addon/fusion/client/ayon_fusion/scripts/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/scripts/__init__.py rename to server_addon/fusion/client/ayon_fusion/scripts/__init__.py diff --git a/client/ayon_core/hosts/fusion/scripts/duplicate_with_inputs.py b/server_addon/fusion/client/ayon_fusion/scripts/duplicate_with_inputs.py similarity index 100% rename from client/ayon_core/hosts/fusion/scripts/duplicate_with_inputs.py rename to server_addon/fusion/client/ayon_fusion/scripts/duplicate_with_inputs.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/__init__.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/__init__.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/__init__.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/__init__.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_cmp.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_cmp.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_cmp.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_cmp.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_cmp.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/_cmp.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_cmp.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_cmp.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_compat.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_compat.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_compat.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_compat.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_config.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_config.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_config.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_config.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_funcs.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_funcs.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_funcs.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_funcs.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_make.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_make.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_make.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_make.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_next_gen.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_next_gen.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_next_gen.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_next_gen.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_version_info.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_version_info.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_version_info.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_version_info.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_version_info.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/_version_info.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_version_info.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_version_info.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/converters.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/converters.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/converters.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/converters.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/converters.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/converters.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/converters.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/converters.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/exceptions.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/exceptions.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/exceptions.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/exceptions.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/exceptions.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/exceptions.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/exceptions.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/exceptions.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/filters.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/filters.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/filters.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/filters.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/filters.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/filters.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/filters.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/filters.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/py.typed b/server_addon/fusion/client/ayon_fusion/vendor/attr/py.typed similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/py.typed rename to server_addon/fusion/client/ayon_fusion/vendor/attr/py.typed diff --git a/client/ayon_core/hosts/fusion/vendor/attr/setters.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/setters.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/setters.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/setters.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/setters.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/setters.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/setters.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/setters.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/validators.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/validators.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/validators.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/validators.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/validators.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/validators.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/validators.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/validators.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/_collections.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/_collections.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/_collections.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/_collections.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/_version.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/_version.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/_version.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/_version.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/connection.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/connection.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/connection.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/connection.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/connectionpool.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/connectionpool.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/connectionpool.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/connectionpool.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_appengine_environ.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_appengine_environ.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_appengine_environ.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_appengine_environ.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/bindings.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/bindings.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/bindings.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/bindings.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/low_level.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/low_level.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/low_level.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/low_level.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/appengine.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/appengine.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/appengine.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/appengine.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/ntlmpool.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/ntlmpool.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/ntlmpool.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/ntlmpool.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/pyopenssl.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/pyopenssl.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/pyopenssl.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/pyopenssl.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/securetransport.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/securetransport.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/securetransport.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/securetransport.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/socks.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/socks.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/socks.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/socks.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/exceptions.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/exceptions.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/exceptions.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/exceptions.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/fields.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/fields.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/fields.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/fields.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/filepost.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/filepost.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/filepost.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/filepost.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/backports/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/backports/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/backports/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/backports/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/backports/makefile.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/backports/makefile.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/backports/makefile.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/backports/makefile.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/six.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/six.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/six.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/six.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/ssl_match_hostname/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/ssl_match_hostname/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/ssl_match_hostname/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/ssl_match_hostname/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/ssl_match_hostname/_implementation.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/ssl_match_hostname/_implementation.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/ssl_match_hostname/_implementation.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/ssl_match_hostname/_implementation.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/poolmanager.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/poolmanager.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/poolmanager.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/poolmanager.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/request.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/request.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/request.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/request.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/response.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/response.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/response.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/response.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/connection.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/connection.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/connection.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/connection.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/proxy.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/proxy.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/proxy.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/proxy.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/queue.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/queue.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/queue.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/queue.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/request.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/request.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/request.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/request.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/response.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/response.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/response.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/response.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/retry.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/retry.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/retry.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/retry.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/ssl_.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/ssl_.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/ssl_.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/ssl_.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/ssltransport.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/ssltransport.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/ssltransport.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/ssltransport.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/timeout.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/timeout.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/timeout.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/timeout.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/url.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/url.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/url.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/url.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/wait.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/wait.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/wait.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/wait.py From 095cf69a97a525a1add462b6a53bd889d248c3f2 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 31 May 2024 11:13:09 +0200 Subject: [PATCH 2/7] added more information to package.py --- server_addon/fusion/package.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server_addon/fusion/package.py b/server_addon/fusion/package.py index 9e7a46df2c..e82e9bf0f6 100644 --- a/server_addon/fusion/package.py +++ b/server_addon/fusion/package.py @@ -1,3 +1,10 @@ name = "fusion" title = "Fusion" -version = "0.1.5" +version = "0.2.0" + +client_dir = "ayon_fusion" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} From 8b5b88de900f4460bfe758bf67c7ef6fa519d7b9 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 31 May 2024 16:26:25 +0200 Subject: [PATCH 3/7] fix imports --- server_addon/fusion/client/ayon_fusion/api/action.py | 2 +- server_addon/fusion/client/ayon_fusion/api/menu.py | 4 ++-- server_addon/fusion/client/ayon_fusion/api/pipeline.py | 6 +++--- server_addon/fusion/client/ayon_fusion/api/plugin.py | 2 +- .../client/ayon_fusion/deploy/MenuScripts/launch_menu.py | 4 ++-- .../client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py | 2 +- .../client/ayon_fusion/hooks/pre_fusion_profile_hook.py | 2 +- .../fusion/client/ayon_fusion/hooks/pre_fusion_setup.py | 2 +- .../client/ayon_fusion/plugins/create/create_image_saver.py | 2 +- .../client/ayon_fusion/plugins/create/create_saver.py | 4 ++-- .../client/ayon_fusion/plugins/create/create_workfile.py | 2 +- .../ayon_fusion/plugins/inventory/select_containers.py | 2 +- .../client/ayon_fusion/plugins/inventory/set_tool_color.py | 2 +- .../fusion/client/ayon_fusion/plugins/load/actions.py | 4 ++-- .../fusion/client/ayon_fusion/plugins/load/load_alembic.py | 2 +- .../fusion/client/ayon_fusion/plugins/load/load_fbx.py | 2 +- .../fusion/client/ayon_fusion/plugins/load/load_sequence.py | 2 +- .../fusion/client/ayon_fusion/plugins/load/load_usd.py | 4 ++-- .../fusion/client/ayon_fusion/plugins/load/load_workfile.py | 2 +- .../client/ayon_fusion/plugins/publish/collect_comp.py | 2 +- .../client/ayon_fusion/plugins/publish/collect_render.py | 2 +- .../ayon_fusion/plugins/publish/extract_render_local.py | 4 ++-- .../plugins/publish/validate_background_depth.py | 2 +- .../plugins/publish/validate_create_folder_checked.py | 2 +- .../plugins/publish/validate_expected_frames_existence.py | 2 +- .../plugins/publish/validate_filename_has_extension.py | 2 +- .../plugins/publish/validate_instance_in_context.py | 2 +- .../ayon_fusion/plugins/publish/validate_saver_has_input.py | 2 +- .../plugins/publish/validate_saver_passthrough.py | 2 +- .../plugins/publish/validate_saver_resolution.py | 4 ++-- .../ayon_fusion/plugins/publish/validate_unique_subsets.py | 2 +- .../client/ayon_fusion/scripts/duplicate_with_inputs.py | 2 +- 32 files changed, 41 insertions(+), 41 deletions(-) diff --git a/server_addon/fusion/client/ayon_fusion/api/action.py b/server_addon/fusion/client/ayon_fusion/api/action.py index a0c6aafcb5..02cd96f56c 100644 --- a/server_addon/fusion/client/ayon_fusion/api/action.py +++ b/server_addon/fusion/client/ayon_fusion/api/action.py @@ -1,7 +1,7 @@ import pyblish.api -from ayon_core.hosts.fusion.api.lib import get_current_comp +from ayon_fusion.api.lib import get_current_comp from ayon_core.pipeline.publish import get_errored_instances_from_context diff --git a/server_addon/fusion/client/ayon_fusion/api/menu.py b/server_addon/fusion/client/ayon_fusion/api/menu.py index 6a64ad2120..38d8c36bb1 100644 --- a/server_addon/fusion/client/ayon_fusion/api/menu.py +++ b/server_addon/fusion/client/ayon_fusion/api/menu.py @@ -6,10 +6,10 @@ from qtpy import QtWidgets, QtCore, QtGui from ayon_core.tools.utils import host_tools from ayon_core.style import load_stylesheet from ayon_core.lib import register_event_callback -from ayon_core.hosts.fusion.scripts import ( +from ayon_fusion.scripts import ( duplicate_with_inputs, ) -from ayon_core.hosts.fusion.api.lib import ( +from ayon_fusion.api.lib import ( set_current_context_framerange, set_current_context_resolution, ) diff --git a/server_addon/fusion/client/ayon_fusion/api/pipeline.py b/server_addon/fusion/client/ayon_fusion/api/pipeline.py index 2d1073ec7d..071b4b8fb5 100644 --- a/server_addon/fusion/client/ayon_fusion/api/pipeline.py +++ b/server_addon/fusion/client/ayon_fusion/api/pipeline.py @@ -22,9 +22,9 @@ from ayon_core.pipeline import ( AVALON_CONTAINER_ID, ) from ayon_core.pipeline.load import any_outdated_containers -from ayon_core.hosts.fusion import FUSION_HOST_DIR from ayon_core.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost from ayon_core.tools.utils import host_tools +from ayon_fusion import FUSION_HOST_DIR from .lib import ( @@ -80,7 +80,7 @@ class FusionHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): and loaders into fusion. It is called automatically when installing via - `ayon_core.pipeline.install_host(ayon_core.hosts.fusion.api)` + `ayon_core.pipeline.install_host(ayon_fusion.api)` See the Maya equivalent for inspiration on how to implement this. @@ -127,7 +127,7 @@ class FusionHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): def open_workfile(self, filepath): # Hack to get fusion, see - # ayon_core.hosts.fusion.api.pipeline.get_current_comp() + # ayon_fusion.api.pipeline.get_current_comp() fusion = getattr(sys.modules["__main__"], "fusion", None) return fusion.LoadComp(filepath) diff --git a/server_addon/fusion/client/ayon_fusion/api/plugin.py b/server_addon/fusion/client/ayon_fusion/api/plugin.py index efe8269120..48e133cc63 100644 --- a/server_addon/fusion/client/ayon_fusion/api/plugin.py +++ b/server_addon/fusion/client/ayon_fusion/api/plugin.py @@ -1,7 +1,7 @@ from copy import deepcopy import os -from ayon_core.hosts.fusion.api import ( +from ayon_fusion.api import ( get_current_comp, comp_lock_and_undo_chunk, ) diff --git a/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py b/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py index 640f78eeb8..0bd00ae2b8 100644 --- a/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py +++ b/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py @@ -26,8 +26,8 @@ def main(env): # However the contents of that folder can conflict with Qt library dlls # so we make sure to move out of it to avoid DLL Load Failed errors. os.chdir("..") - from ayon_core.hosts.fusion.api import FusionHost - from ayon_core.hosts.fusion.api import menu + from ayon_fusion.api import FusionHost + from ayon_fusion.api import menu # activate resolve from pype install_host(FusionHost()) diff --git a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py index 113a1ffe59..8ae8b5027c 100644 --- a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py +++ b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py @@ -1,6 +1,6 @@ import os from ayon_applications import PreLaunchHook -from ayon_core.hosts.fusion import FUSION_HOST_DIR +from ayon_fusion import FUSION_HOST_DIR class FusionLaunchMenuHook(PreLaunchHook): diff --git a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py index 1064d0a83a..b715bb31b5 100644 --- a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py +++ b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py @@ -2,7 +2,7 @@ import os import shutil import platform from pathlib import Path -from ayon_core.hosts.fusion import ( +from ayon_fusion import ( FUSION_HOST_DIR, FUSION_VERSIONS_DICT, get_fusion_version, diff --git a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py index ef084b0483..c29a0617cc 100644 --- a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py +++ b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py @@ -4,7 +4,7 @@ from ayon_applications import ( LaunchTypes, ApplicationLaunchFailed, ) -from ayon_core.hosts.fusion import ( +from ayon_fusion import ( FUSION_HOST_DIR, FUSION_VERSIONS_DICT, get_fusion_version, diff --git a/server_addon/fusion/client/ayon_fusion/plugins/create/create_image_saver.py b/server_addon/fusion/client/ayon_fusion/plugins/create/create_image_saver.py index 729843d078..d88219b268 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/create/create_image_saver.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/create/create_image_saver.py @@ -1,6 +1,6 @@ from ayon_core.lib import NumberDef -from ayon_core.hosts.fusion.api.plugin import GenericCreateSaver +from ayon_fusion.api.plugin import GenericCreateSaver class CreateImageSaver(GenericCreateSaver): diff --git a/server_addon/fusion/client/ayon_fusion/plugins/create/create_saver.py b/server_addon/fusion/client/ayon_fusion/plugins/create/create_saver.py index 20c7b99851..3e7d9486ce 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/create/create_saver.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/create/create_saver.py @@ -4,8 +4,8 @@ from ayon_core.lib import ( EnumDef ) -from ayon_core.hosts.fusion.api.plugin import GenericCreateSaver -from ayon_core.hosts.fusion.api.lib import get_current_comp +from ayon_fusion.api.plugin import GenericCreateSaver +from ayon_fusion.api.lib import get_current_comp class CreateSaver(GenericCreateSaver): diff --git a/server_addon/fusion/client/ayon_fusion/plugins/create/create_workfile.py b/server_addon/fusion/client/ayon_fusion/plugins/create/create_workfile.py index a2fe027ef4..3dc14861df 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/create/create_workfile.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/create/create_workfile.py @@ -1,6 +1,6 @@ import ayon_api -from ayon_core.hosts.fusion.api import ( +from ayon_fusion.api import ( get_current_comp ) from ayon_core.pipeline import ( diff --git a/server_addon/fusion/client/ayon_fusion/plugins/inventory/select_containers.py b/server_addon/fusion/client/ayon_fusion/plugins/inventory/select_containers.py index 167cd3be1f..e863c58ab3 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/inventory/select_containers.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/inventory/select_containers.py @@ -8,7 +8,7 @@ class FusionSelectContainers(InventoryAction): color = "#d8d8d8" def process(self, containers): - from ayon_core.hosts.fusion.api import ( + from ayon_fusion.api import ( get_current_comp, comp_lock_and_undo_chunk ) diff --git a/server_addon/fusion/client/ayon_fusion/plugins/inventory/set_tool_color.py b/server_addon/fusion/client/ayon_fusion/plugins/inventory/set_tool_color.py index 7167cf0fc5..2c02afe32c 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/inventory/set_tool_color.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/inventory/set_tool_color.py @@ -2,7 +2,7 @@ from qtpy import QtGui, QtWidgets from ayon_core.pipeline import InventoryAction from ayon_core import style -from ayon_core.hosts.fusion.api import ( +from ayon_fusion.api import ( get_current_comp, comp_lock_and_undo_chunk ) diff --git a/server_addon/fusion/client/ayon_fusion/plugins/load/actions.py b/server_addon/fusion/client/ayon_fusion/plugins/load/actions.py index 95400ea41c..dfa73e0b7a 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/load/actions.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/load/actions.py @@ -27,7 +27,7 @@ class FusionSetFrameRangeLoader(load.LoaderPlugin): def load(self, context, name, namespace, data): - from ayon_core.hosts.fusion.api import lib + from ayon_fusion.api import lib version_attributes = context["version"]["attrib"] @@ -63,7 +63,7 @@ class FusionSetFrameRangeWithHandlesLoader(load.LoaderPlugin): def load(self, context, name, namespace, data): - from ayon_core.hosts.fusion.api import lib + from ayon_fusion.api import lib version_attributes = context["version"]["attrib"] start = version_attributes.get("frameStart", None) diff --git a/server_addon/fusion/client/ayon_fusion/plugins/load/load_alembic.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_alembic.py index 312362caca..2e763b5330 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/load/load_alembic.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/load/load_alembic.py @@ -2,7 +2,7 @@ from ayon_core.pipeline import ( load, get_representation_path, ) -from ayon_core.hosts.fusion.api import ( +from ayon_fusion.api import ( imprint_container, get_current_comp, comp_lock_and_undo_chunk diff --git a/server_addon/fusion/client/ayon_fusion/plugins/load/load_fbx.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_fbx.py index a84e7e0914..a080fa3983 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/load/load_fbx.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/load/load_fbx.py @@ -2,7 +2,7 @@ from ayon_core.pipeline import ( load, get_representation_path, ) -from ayon_core.hosts.fusion.api import ( +from ayon_fusion.api import ( imprint_container, get_current_comp, comp_lock_and_undo_chunk, diff --git a/server_addon/fusion/client/ayon_fusion/plugins/load/load_sequence.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_sequence.py index 7c70b54e48..233f1d7021 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/load/load_sequence.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/load/load_sequence.py @@ -1,7 +1,7 @@ import contextlib import ayon_core.pipeline.load as load -from ayon_core.hosts.fusion.api import ( +from ayon_fusion.api import ( imprint_container, get_current_comp, comp_lock_and_undo_chunk, diff --git a/server_addon/fusion/client/ayon_fusion/plugins/load/load_usd.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_usd.py index 309b0c094c..42ce339faf 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/load/load_usd.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/load/load_usd.py @@ -2,12 +2,12 @@ from ayon_core.pipeline import ( load, get_representation_path, ) -from ayon_core.hosts.fusion.api import ( +from ayon_fusion.api import ( imprint_container, get_current_comp, comp_lock_and_undo_chunk ) -from ayon_core.hosts.fusion.api.lib import get_fusion_module +from ayon_fusion.api.lib import get_fusion_module class FusionLoadUSD(load.LoaderPlugin): diff --git a/server_addon/fusion/client/ayon_fusion/plugins/load/load_workfile.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_workfile.py index 818fbcb187..c728f6b4aa 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/load/load_workfile.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/load/load_workfile.py @@ -5,7 +5,7 @@ is no update or reload function added for this plugin from ayon_core.pipeline import load -from ayon_core.hosts.fusion.api import ( +from ayon_fusion.api import ( get_current_comp, get_bmd_library, ) diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp.py index 591c460d5a..2e5bcd63db 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp.py @@ -1,6 +1,6 @@ import pyblish.api -from ayon_core.hosts.fusion.api import get_current_comp +from ayon_fusion.api import get_current_comp class CollectCurrentCompFusion(pyblish.api.ContextPlugin): diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_render.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_render.py index 9c04e59717..af52aee861 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_render.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_render.py @@ -4,7 +4,7 @@ import pyblish.api from ayon_core.pipeline import publish from ayon_core.pipeline.publish import RenderInstance -from ayon_core.hosts.fusion.api.lib import get_frame_path +from ayon_fusion.api.lib import get_frame_path @attr.s diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/extract_render_local.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/extract_render_local.py index 39fa20cfc0..bbcba5366d 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/extract_render_local.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/extract_render_local.py @@ -5,8 +5,8 @@ import collections import pyblish.api from ayon_core.pipeline import publish -from ayon_core.hosts.fusion.api import comp_lock_and_undo_chunk -from ayon_core.hosts.fusion.api.lib import get_frame_path, maintained_comp_range +from ayon_fusion.api import comp_lock_and_undo_chunk +from ayon_fusion.api.lib import get_frame_path, maintained_comp_range log = logging.getLogger(__name__) diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_background_depth.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_background_depth.py index d588748cfa..90b6b110a4 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_background_depth.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_background_depth.py @@ -6,7 +6,7 @@ from ayon_core.pipeline import ( PublishValidationError, ) -from ayon_core.hosts.fusion.api.action import SelectInvalidAction +from ayon_fusion.api.action import SelectInvalidAction class ValidateBackgroundDepth( diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_create_folder_checked.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_create_folder_checked.py index 13ea85b48c..1b910123f0 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_create_folder_checked.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_create_folder_checked.py @@ -3,7 +3,7 @@ import pyblish.api from ayon_core.pipeline.publish import RepairAction from ayon_core.pipeline import PublishValidationError -from ayon_core.hosts.fusion.api.action import SelectInvalidAction +from ayon_fusion.api.action import SelectInvalidAction class ValidateCreateFolderChecked(pyblish.api.InstancePlugin): diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_expected_frames_existence.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_expected_frames_existence.py index 83d1feaefd..6dc9642581 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_expected_frames_existence.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_expected_frames_existence.py @@ -4,7 +4,7 @@ import pyblish.api from ayon_core.pipeline.publish import RepairAction from ayon_core.pipeline import PublishValidationError -from ayon_core.hosts.fusion.api.action import SelectInvalidAction +from ayon_fusion.api.action import SelectInvalidAction class ValidateLocalFramesExistence(pyblish.api.InstancePlugin): diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_filename_has_extension.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_filename_has_extension.py index 17b1aa47c8..471c0ca31a 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_filename_has_extension.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_filename_has_extension.py @@ -3,7 +3,7 @@ import os import pyblish.api from ayon_core.pipeline import PublishValidationError -from ayon_core.hosts.fusion.api.action import SelectInvalidAction +from ayon_fusion.api.action import SelectInvalidAction class ValidateFilenameHasExtension(pyblish.api.InstancePlugin): diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_in_context.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_in_context.py index 3aa6fb452f..7b8b70b2fb 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_in_context.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_in_context.py @@ -2,7 +2,7 @@ """Validate if instance context is the same as publish context.""" import pyblish.api -from ayon_core.hosts.fusion.api.action import SelectToolAction +from ayon_fusion.api.action import SelectToolAction from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_has_input.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_has_input.py index a8977e4747..de2cd1d862 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_has_input.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_has_input.py @@ -1,7 +1,7 @@ import pyblish.api from ayon_core.pipeline import PublishValidationError -from ayon_core.hosts.fusion.api.action import SelectInvalidAction +from ayon_fusion.api.action import SelectInvalidAction class ValidateSaverHasInput(pyblish.api.InstancePlugin): diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_passthrough.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_passthrough.py index acafe3308f..caa17168bc 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_passthrough.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_passthrough.py @@ -1,7 +1,7 @@ import pyblish.api from ayon_core.pipeline import PublishValidationError -from ayon_core.hosts.fusion.api.action import SelectInvalidAction +from ayon_fusion.api.action import SelectInvalidAction class ValidateSaverPassthrough(pyblish.api.ContextPlugin): diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_resolution.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_resolution.py index 17992b123c..15d96a9afc 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_resolution.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_resolution.py @@ -4,8 +4,8 @@ from ayon_core.pipeline import ( OptionalPyblishPluginMixin, ) -from ayon_core.hosts.fusion.api.action import SelectInvalidAction -from ayon_core.hosts.fusion.api import comp_lock_and_undo_chunk +from ayon_fusion.api.action import SelectInvalidAction +from ayon_fusion.api import comp_lock_and_undo_chunk class ValidateSaverResolution( diff --git a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_unique_subsets.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_unique_subsets.py index bcd9abd8b0..dd7df54da5 100644 --- a/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_unique_subsets.py +++ b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_unique_subsets.py @@ -3,7 +3,7 @@ from collections import defaultdict import pyblish.api from ayon_core.pipeline import PublishValidationError -from ayon_core.hosts.fusion.api.action import SelectInvalidAction +from ayon_fusion.api.action import SelectInvalidAction class ValidateUniqueSubsets(pyblish.api.ContextPlugin): diff --git a/server_addon/fusion/client/ayon_fusion/scripts/duplicate_with_inputs.py b/server_addon/fusion/client/ayon_fusion/scripts/duplicate_with_inputs.py index 727fd335ea..78edb1b3ba 100644 --- a/server_addon/fusion/client/ayon_fusion/scripts/duplicate_with_inputs.py +++ b/server_addon/fusion/client/ayon_fusion/scripts/duplicate_with_inputs.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.fusion.api import ( +from ayon_fusion.api import ( comp_lock_and_undo_chunk, get_current_comp ) From 8f20f3ce0805435f0b934bf669f47fc92029d073 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 31 May 2024 16:26:50 +0200 Subject: [PATCH 4/7] added fusion version milestone --- client/ayon_core/addon/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py index fcd41c5f7d..e14c8f9164 100644 --- a/client/ayon_core/addon/base.py +++ b/client/ayon_core/addon/base.py @@ -54,6 +54,7 @@ MOVED_ADDON_MILESTONE_VERSIONS = { "celaction": VersionInfo(0, 2, 0), "clockify": VersionInfo(0, 2, 0), "flame": VersionInfo(0, 2, 0), + "fusion": VersionInfo(0, 2, 0), "max": VersionInfo(0, 2, 0), "traypublisher": VersionInfo(0, 2, 0), "tvpaint": VersionInfo(0, 2, 0), From 2253e65f7ded6af4b84f92c4dcded3f221beb376 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 31 May 2024 16:29:42 +0200 Subject: [PATCH 5/7] renamed 'FUSION_HOST_DIR' to 'FUSION_ADDON_ROOT' --- server_addon/fusion/client/ayon_fusion/__init__.py | 4 ++-- server_addon/fusion/client/ayon_fusion/addon.py | 4 ++-- server_addon/fusion/client/ayon_fusion/api/pipeline.py | 4 ++-- .../client/ayon_fusion/deploy/MenuScripts/launch_menu.py | 5 ++--- .../client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py | 4 ++-- .../client/ayon_fusion/hooks/pre_fusion_profile_hook.py | 4 ++-- .../fusion/client/ayon_fusion/hooks/pre_fusion_setup.py | 6 +++--- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/server_addon/fusion/client/ayon_fusion/__init__.py b/server_addon/fusion/client/ayon_fusion/__init__.py index 1da11ba9d1..205750f84a 100644 --- a/server_addon/fusion/client/ayon_fusion/__init__.py +++ b/server_addon/fusion/client/ayon_fusion/__init__.py @@ -1,7 +1,7 @@ from .addon import ( get_fusion_version, FusionAddon, - FUSION_HOST_DIR, + FUSION_ADDON_ROOT, FUSION_VERSIONS_DICT, ) @@ -9,6 +9,6 @@ from .addon import ( __all__ = ( "get_fusion_version", "FusionAddon", - "FUSION_HOST_DIR", + "FUSION_ADDON_ROOT", "FUSION_VERSIONS_DICT", ) diff --git a/server_addon/fusion/client/ayon_fusion/addon.py b/server_addon/fusion/client/ayon_fusion/addon.py index 54e48ea7bf..91d24ddc8b 100644 --- a/server_addon/fusion/client/ayon_fusion/addon.py +++ b/server_addon/fusion/client/ayon_fusion/addon.py @@ -3,7 +3,7 @@ import re from ayon_core.addon import AYONAddon, IHostAddon from ayon_core.lib import Logger -FUSION_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) +FUSION_ADDON_ROOT = os.path.dirname(os.path.abspath(__file__)) # FUSION_VERSIONS_DICT is used by the pre-launch hooks # The keys correspond to all currently supported Fusion versions @@ -55,7 +55,7 @@ class FusionAddon(AYONAddon, IHostAddon): def get_launch_hook_paths(self, app): if app.host_name != self.host_name: return [] - return [os.path.join(FUSION_HOST_DIR, "hooks")] + return [os.path.join(FUSION_ADDON_ROOT, "hooks")] def add_implementation_envs(self, env, app): # Set default values if are not already set via settings diff --git a/server_addon/fusion/client/ayon_fusion/api/pipeline.py b/server_addon/fusion/client/ayon_fusion/api/pipeline.py index 071b4b8fb5..04f0d3db9a 100644 --- a/server_addon/fusion/client/ayon_fusion/api/pipeline.py +++ b/server_addon/fusion/client/ayon_fusion/api/pipeline.py @@ -24,7 +24,7 @@ from ayon_core.pipeline import ( from ayon_core.pipeline.load import any_outdated_containers from ayon_core.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost from ayon_core.tools.utils import host_tools -from ayon_fusion import FUSION_HOST_DIR +from ayon_fusion import FUSION_ADDON_ROOT from .lib import ( @@ -35,7 +35,7 @@ from .lib import ( log = Logger.get_logger(__name__) -PLUGINS_DIR = os.path.join(FUSION_HOST_DIR, "plugins") +PLUGINS_DIR = os.path.join(FUSION_ADDON_ROOT, "plugins") PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") LOAD_PATH = os.path.join(PLUGINS_DIR, "load") diff --git a/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py b/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py index 0bd00ae2b8..0c5010f6a7 100644 --- a/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py +++ b/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py @@ -5,10 +5,9 @@ if sys.version_info < (3, 7): # hack to handle discrepancy between distributed libraries and Python 3.6 # mostly because wrong version of urllib3 # TODO remove when not necessary - from ayon_core import AYON_CORE_ROOT - FUSION_HOST_DIR = os.path.join(AYON_CORE_ROOT, "hosts", "fusion") + from ayon_fusion import FUSION_ADDON_ROOT - vendor_path = os.path.join(FUSION_HOST_DIR, "vendor") + vendor_path = os.path.join(FUSION_ADDON_ROOT, "vendor") if vendor_path not in sys.path: sys.path.insert(0, vendor_path) diff --git a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py index 8ae8b5027c..035cbb8d97 100644 --- a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py +++ b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py @@ -1,6 +1,6 @@ import os from ayon_applications import PreLaunchHook -from ayon_fusion import FUSION_HOST_DIR +from ayon_fusion import FUSION_ADDON_ROOT class FusionLaunchMenuHook(PreLaunchHook): @@ -28,7 +28,7 @@ class FusionLaunchMenuHook(PreLaunchHook): "Validation for Fusion version 18+ for /execute " "prelaunch argument skipped.") - path = os.path.join(FUSION_HOST_DIR, + path = os.path.join(FUSION_ADDON_ROOT, "deploy", "MenuScripts", "launch_menu.py").replace("\\", "/") diff --git a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py index b715bb31b5..7758798bb6 100644 --- a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py +++ b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py @@ -3,7 +3,7 @@ import shutil import platform from pathlib import Path from ayon_fusion import ( - FUSION_HOST_DIR, + FUSION_ADDON_ROOT, FUSION_VERSIONS_DICT, get_fusion_version, ) @@ -163,7 +163,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): master_prefs_variable = f"FUSION{profile_version}_MasterPrefs" master_prefs = Path( - FUSION_HOST_DIR, "deploy", "ayon", "fusion_shared.prefs") + FUSION_ADDON_ROOT, "deploy", "ayon", "fusion_shared.prefs") self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") self.launch_context.env[master_prefs_variable] = str(master_prefs) diff --git a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py index c29a0617cc..25cf40f18d 100644 --- a/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py +++ b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py @@ -5,7 +5,7 @@ from ayon_applications import ( ApplicationLaunchFailed, ) from ayon_fusion import ( - FUSION_HOST_DIR, + FUSION_ADDON_ROOT, FUSION_VERSIONS_DICT, get_fusion_version, ) @@ -67,5 +67,5 @@ class FusionPrelaunch(PreLaunchHook): # for hook installing PySide2 self.data["fusion_python3_home"] = py3_dir - self.log.info(f"Setting AYON_FUSION_ROOT: {FUSION_HOST_DIR}") - self.launch_context.env["AYON_FUSION_ROOT"] = FUSION_HOST_DIR + self.log.info(f"Setting AYON_FUSION_ROOT: {FUSION_ADDON_ROOT}") + self.launch_context.env["AYON_FUSION_ROOT"] = FUSION_ADDON_ROOT From 9d42f7f613585e9dfef8cc7717512a1cfe0bb15f Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 31 May 2024 16:30:15 +0200 Subject: [PATCH 6/7] added version to client code --- server_addon/fusion/client/ayon_fusion/__init__.py | 3 +++ server_addon/fusion/client/ayon_fusion/addon.py | 3 +++ server_addon/fusion/client/ayon_fusion/version.py | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 server_addon/fusion/client/ayon_fusion/version.py diff --git a/server_addon/fusion/client/ayon_fusion/__init__.py b/server_addon/fusion/client/ayon_fusion/__init__.py index 205750f84a..f2ddccdd87 100644 --- a/server_addon/fusion/client/ayon_fusion/__init__.py +++ b/server_addon/fusion/client/ayon_fusion/__init__.py @@ -1,3 +1,4 @@ +from .version import __version__ from .addon import ( get_fusion_version, FusionAddon, @@ -7,6 +8,8 @@ from .addon import ( __all__ = ( + "__version__", + "get_fusion_version", "FusionAddon", "FUSION_ADDON_ROOT", diff --git a/server_addon/fusion/client/ayon_fusion/addon.py b/server_addon/fusion/client/ayon_fusion/addon.py index 91d24ddc8b..ffc70b6ff4 100644 --- a/server_addon/fusion/client/ayon_fusion/addon.py +++ b/server_addon/fusion/client/ayon_fusion/addon.py @@ -3,6 +3,8 @@ import re from ayon_core.addon import AYONAddon, IHostAddon from ayon_core.lib import Logger +from .version import __version__ + FUSION_ADDON_ROOT = os.path.dirname(os.path.abspath(__file__)) # FUSION_VERSIONS_DICT is used by the pre-launch hooks @@ -50,6 +52,7 @@ def get_fusion_version(app_name): class FusionAddon(AYONAddon, IHostAddon): name = "fusion" + version = __version__ host_name = "fusion" def get_launch_hook_paths(self, app): diff --git a/server_addon/fusion/client/ayon_fusion/version.py b/server_addon/fusion/client/ayon_fusion/version.py new file mode 100644 index 0000000000..209eddcdb6 --- /dev/null +++ b/server_addon/fusion/client/ayon_fusion/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'fusion' version.""" +__version__ = "0.2.0" From a0d49c7146a1252b554c5f79fd0eb2783b56fee7 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 31 May 2024 16:36:05 +0200 Subject: [PATCH 7/7] fix import in deadline --- .../modules/deadline/plugins/publish/submit_fusion_deadline.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py index 6c70119628..9eea4d6549 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py @@ -79,7 +79,7 @@ class FusionSubmitDeadline( else: context.data[key] = True - from ayon_core.hosts.fusion.api.lib import get_frame_path + from ayon_fusion.api.lib import get_frame_path deadline_url = instance.data["deadline"]["url"] assert deadline_url, "Requires Deadline Webservice URL"