From ee6e42ec6c090eb2ded6302b6cb8e09ef2d55dc0 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 5 Feb 2024 15:46:47 +0100 Subject: [PATCH] change openpype imports to ayon_core --- client/ayon_core/__init__.py | 8 ++-- client/ayon_core/cli.py | 10 ++--- client/ayon_core/client/entities.py | 2 +- client/ayon_core/client/entity_links.py | 2 +- client/ayon_core/client/mongo/mongo.py | 2 +- client/ayon_core/client/mongo/operations.py | 6 +-- client/ayon_core/client/operations.py | 2 +- .../client/server/conversion_utils.py | 4 +- client/ayon_core/client/server/entities.py | 2 +- client/ayon_core/client/server/operations.py | 4 +- client/ayon_core/client/server/utils.py | 4 +- .../hooks/pre_add_last_workfile_arg.py | 2 +- .../hooks/pre_copy_template_workfile.py | 6 +-- .../hooks/pre_create_extra_workdir_folders.py | 4 +- .../ayon_core/hooks/pre_global_host_data.py | 6 +-- client/ayon_core/hooks/pre_mac_launch.py | 2 +- .../ayon_core/hooks/pre_new_console_apps.py | 2 +- .../hooks/pre_non_python_host_launch.py | 8 ++-- client/ayon_core/hooks/pre_ocio_hook.py | 6 +-- client/ayon_core/host/dirmap.py | 8 ++-- client/ayon_core/host/host.py | 8 ++-- client/ayon_core/hosts/aftereffects/addon.py | 2 +- .../hosts/aftereffects/api/README.md | 2 +- .../hosts/aftereffects/api/launch_logic.py | 20 +++++----- .../ayon_core/hosts/aftereffects/api/lib.py | 4 +- .../hosts/aftereffects/api/pipeline.py | 14 +++---- .../hosts/aftereffects/api/plugin.py | 2 +- .../api/workfile_template_builder.py | 10 ++--- .../hosts/aftereffects/api/ws_stub.py | 2 +- .../plugins/create/create_render.py | 16 ++++---- .../plugins/create/workfile_creator.py | 10 ++--- .../plugins/load/load_background.py | 6 +-- .../aftereffects/plugins/load/load_file.py | 6 +-- .../plugins/publish/add_publish_highlight.py | 2 +- .../aftereffects/plugins/publish/closeAE.py | 2 +- .../plugins/publish/collect_audio.py | 2 +- .../plugins/publish/collect_current_file.py | 2 +- .../publish/collect_extension_version.py | 2 +- .../plugins/publish/collect_render.py | 8 ++-- .../plugins/publish/collect_workfile.py | 4 +- .../plugins/publish/extract_local_render.py | 4 +- .../plugins/publish/extract_save_scene.py | 4 +- .../plugins/publish/increment_workfile.py | 6 +-- .../plugins/publish/pre_collect_render.py | 2 +- .../publish/remove_publish_highlight.py | 4 +- .../plugins/publish/validate_footage_items.py | 4 +- .../publish/validate_instance_asset.py | 6 +-- .../publish/validate_scene_settings.py | 4 +- client/ayon_core/hosts/blender/addon.py | 2 +- client/ayon_core/hosts/blender/api/action.py | 2 +- client/ayon_core/hosts/blender/api/lib.py | 2 +- client/ayon_core/hosts/blender/api/ops.py | 8 ++-- .../ayon_core/hosts/blender/api/pipeline.py | 14 +++---- client/ayon_core/hosts/blender/api/plugin.py | 8 ++-- .../ayon_core/hosts/blender/api/render_lib.py | 4 +- .../blender/blender_addon/startup/init.py | 4 +- .../hooks/pre_add_run_python_script_arg.py | 2 +- .../hosts/blender/hooks/pre_pyside_install.py | 2 +- .../blender/hooks/pre_windows_console.py | 2 +- .../blender/plugins/create/convert_legacy.py | 4 +- .../blender/plugins/create/create_action.py | 2 +- .../plugins/create/create_animation.py | 2 +- .../plugins/create/create_blendScene.py | 2 +- .../blender/plugins/create/create_camera.py | 4 +- .../blender/plugins/create/create_layout.py | 2 +- .../blender/plugins/create/create_model.py | 2 +- .../plugins/create/create_pointcache.py | 2 +- .../blender/plugins/create/create_render.py | 4 +- .../blender/plugins/create/create_review.py | 2 +- .../blender/plugins/create/create_rig.py | 2 +- .../blender/plugins/create/create_workfile.py | 10 ++--- .../blender/plugins/load/import_workfile.py | 2 +- .../hosts/blender/plugins/load/load_abc.py | 6 +-- .../hosts/blender/plugins/load/load_action.py | 6 +-- .../blender/plugins/load/load_animation.py | 4 +- .../hosts/blender/plugins/load/load_audio.py | 6 +-- .../hosts/blender/plugins/load/load_blend.py | 10 ++--- .../blender/plugins/load/load_blendscene.py | 8 ++-- .../blender/plugins/load/load_camera_abc.py | 6 +-- .../blender/plugins/load/load_camera_fbx.py | 6 +-- .../hosts/blender/plugins/load/load_fbx.py | 6 +-- .../blender/plugins/load/load_layout_json.py | 6 +-- .../hosts/blender/plugins/load/load_look.py | 6 +-- .../plugins/publish/collect_current_file.py | 2 +- .../plugins/publish/collect_instance.py | 4 +- .../blender/plugins/publish/collect_render.py | 2 +- .../blender/plugins/publish/extract_abc.py | 4 +- .../plugins/publish/extract_abc_animation.py | 4 +- .../blender/plugins/publish/extract_blend.py | 2 +- .../publish/extract_blend_animation.py | 2 +- .../plugins/publish/extract_camera_abc.py | 6 +-- .../plugins/publish/extract_camera_fbx.py | 4 +- .../blender/plugins/publish/extract_fbx.py | 6 +-- .../plugins/publish/extract_fbx_animation.py | 6 +-- .../blender/plugins/publish/extract_layout.py | 8 ++-- .../plugins/publish/extract_playblast.py | 6 +-- .../plugins/publish/extract_thumbnail.py | 6 +-- .../publish/increment_workfile_version.py | 6 +-- .../plugins/publish/integrate_animation.py | 2 +- .../publish/validate_camera_zero_keyframe.py | 4 +- .../publish/validate_deadline_publish.py | 4 +- .../plugins/publish/validate_file_saved.py | 2 +- .../publish/validate_instance_empty.py | 2 +- .../plugins/publish/validate_mesh_has_uv.py | 4 +- .../validate_mesh_no_negative_scale.py | 4 +- .../publish/validate_no_colons_in_name.py | 4 +- .../plugins/publish/validate_object_mode.py | 4 +- .../publish/validate_render_camera_is_set.py | 2 +- .../publish/validate_transform_zero.py | 4 +- client/ayon_core/hosts/celaction/addon.py | 2 +- .../celaction/hooks/pre_celaction_setup.py | 6 +-- .../publish/collect_celaction_instances.py | 2 +- .../plugins/publish/integrate_version_up.py | 6 ++- .../hosts/celaction/scripts/publish_cli.py | 8 ++-- client/ayon_core/hosts/flame/addon.py | 2 +- client/ayon_core/hosts/flame/api/lib.py | 2 +- client/ayon_core/hosts/flame/api/menu.py | 6 +-- client/ayon_core/hosts/flame/api/pipeline.py | 6 +-- client/ayon_core/hosts/flame/api/plugin.py | 10 ++--- .../ayon_core/hosts/flame/api/render_utils.py | 2 +- client/ayon_core/hosts/flame/api/utils.py | 2 +- client/ayon_core/hosts/flame/api/workio.py | 2 +- .../hosts/flame/hooks/pre_flame_setup.py | 6 +-- .../hosts/flame/otio/flame_export.py | 2 +- .../flame/plugins/create/create_shot_clip.py | 2 +- .../hosts/flame/plugins/load/load_clip.py | 6 +-- .../flame/plugins/load/load_clip_batch.py | 6 +-- .../plugins/publish/collect_test_selection.py | 4 +- .../publish/collect_timeline_instances.py | 6 +-- .../plugins/publish/collect_timeline_otio.py | 8 ++-- .../plugins/publish/extract_otio_file.py | 2 +- .../publish/extract_subset_resources.py | 8 ++-- .../plugins/publish/integrate_batch_group.py | 6 +-- .../hosts/flame/startup/openpype_in_flame.py | 4 +- client/ayon_core/hosts/fusion/addon.py | 4 +- client/ayon_core/hosts/fusion/api/action.py | 4 +- client/ayon_core/hosts/fusion/api/lib.py | 12 +++--- client/ayon_core/hosts/fusion/api/menu.py | 14 +++---- client/ayon_core/hosts/fusion/api/pipeline.py | 16 ++++---- client/ayon_core/hosts/fusion/api/plugin.py | 6 +-- .../fusion/deploy/MenuScripts/launch_menu.py | 12 +++--- .../fusion/hooks/pre_fusion_profile_hook.py | 6 +-- .../hosts/fusion/hooks/pre_fusion_setup.py | 4 +- .../hosts/fusion/hooks/pre_pyside_install.py | 2 +- .../plugins/create/create_image_saver.py | 6 +-- .../fusion/plugins/create/create_saver.py | 4 +- .../fusion/plugins/create/create_workfile.py | 8 ++-- .../plugins/inventory/select_containers.py | 4 +- .../plugins/inventory/set_tool_color.py | 6 +-- .../hosts/fusion/plugins/load/actions.py | 6 +-- .../hosts/fusion/plugins/load/load_alembic.py | 4 +- .../hosts/fusion/plugins/load/load_fbx.py | 4 +- .../fusion/plugins/load/load_sequence.py | 8 ++-- .../hosts/fusion/plugins/load/load_usd.py | 6 +-- .../fusion/plugins/load/load_workfile.py | 4 +- .../fusion/plugins/publish/collect_comp.py | 2 +- .../fusion/plugins/publish/collect_inputs.py | 2 +- .../fusion/plugins/publish/collect_render.py | 6 +-- .../plugins/publish/extract_render_local.py | 6 +-- .../plugins/publish/increment_current_file.py | 8 ++-- .../publish/validate_background_depth.py | 4 +- .../plugins/publish/validate_comp_saved.py | 2 +- .../publish/validate_create_folder_checked.py | 6 +-- .../validate_expected_frames_existence.py | 6 +-- .../validate_filename_has_extension.py | 4 +- .../plugins/publish/validate_image_frame.py | 2 +- .../publish/validate_instance_frame_range.py | 2 +- .../publish/validate_saver_has_input.py | 4 +- .../publish/validate_saver_passthrough.py | 4 +- .../publish/validate_saver_resolution.py | 6 +-- .../publish/validate_unique_subsets.py | 4 +- .../fusion/scripts/duplicate_with_inputs.py | 2 +- client/ayon_core/hosts/harmony/addon.py | 2 +- client/ayon_core/hosts/harmony/api/README.md | 22 +++++------ client/ayon_core/hosts/harmony/api/lib.py | 14 +++---- .../ayon_core/hosts/harmony/api/pipeline.py | 12 +++--- client/ayon_core/hosts/harmony/api/plugin.py | 4 +- .../plugins/create/create_farm_render.py | 4 +- .../harmony/plugins/create/create_render.py | 4 +- .../harmony/plugins/create/create_template.py | 2 +- .../hosts/harmony/plugins/load/load_audio.py | 4 +- .../harmony/plugins/load/load_background.py | 6 +-- .../plugins/load/load_imagesequence.py | 6 +-- .../harmony/plugins/load/load_palette.py | 4 +- .../harmony/plugins/load/load_template.py | 6 +-- .../plugins/load/load_template_workfile.py | 4 +- .../plugins/publish/collect_current_file.py | 2 +- .../plugins/publish/collect_farm_render.py | 8 ++-- .../plugins/publish/collect_instances.py | 2 +- .../plugins/publish/collect_palettes.py | 2 +- .../harmony/plugins/publish/collect_scene.py | 2 +- .../plugins/publish/collect_workfile.py | 2 +- .../plugins/publish/extract_palette.py | 4 +- .../harmony/plugins/publish/extract_render.py | 4 +- .../plugins/publish/extract_save_scene.py | 2 +- .../plugins/publish/extract_template.py | 4 +- .../plugins/publish/extract_workfile.py | 2 +- .../plugins/publish/increment_workfile.py | 6 +-- .../harmony/plugins/publish/validate_audio.py | 4 +- .../plugins/publish/validate_instances.py | 6 +-- .../publish/validate_scene_settings.py | 4 +- client/ayon_core/hosts/hiero/addon.py | 2 +- client/ayon_core/hosts/hiero/api/events.py | 2 +- client/ayon_core/hosts/hiero/api/lib.py | 14 +++---- client/ayon_core/hosts/hiero/api/menu.py | 8 ++-- client/ayon_core/hosts/hiero/api/pipeline.py | 8 ++-- client/ayon_core/hosts/hiero/api/plugin.py | 10 ++--- .../api/startup/Python/Startup/Startup.py | 6 +-- .../Startup/otioexporter/OTIOExportTask.py | 2 +- .../Startup/otioexporter/OTIOExportUI.py | 2 +- .../Python/StartupUI/otioimporter/__init__.py | 2 +- client/ayon_core/hosts/hiero/api/tags.py | 6 +-- client/ayon_core/hosts/hiero/api/workio.py | 2 +- .../hiero/plugins/create/create_shot_clip.py | 4 +- .../hosts/hiero/plugins/load/load_clip.py | 8 ++-- .../hosts/hiero/plugins/load/load_effects.py | 8 ++-- .../publish/collect_frame_tag_instances.py | 2 +- .../plugins/publish/extract_clip_effects.py | 4 +- .../hiero/plugins/publish/extract_frames.py | 4 +- .../plugins/publish/extract_thumbnail.py | 2 +- .../publish/integrate_version_up_workfile.py | 2 +- .../plugins/publish/precollect_instances.py | 8 ++-- .../plugins/publish/precollect_workfile.py | 4 +- .../collect_assetbuilds.py | 2 +- .../publish_old_workflow/precollect_retime.py | 2 +- client/ayon_core/hosts/houdini/addon.py | 2 +- client/ayon_core/hosts/houdini/api/action.py | 2 +- .../ayon_core/hosts/houdini/api/colorspace.py | 4 +- .../hosts/houdini/api/creator_node_shelves.py | 12 +++--- client/ayon_core/hosts/houdini/api/lib.py | 20 +++++----- .../ayon_core/hosts/houdini/api/pipeline.py | 16 ++++---- client/ayon_core/hosts/houdini/api/plugin.py | 6 +-- client/ayon_core/hosts/houdini/api/shelves.py | 6 +-- client/ayon_core/hosts/houdini/api/usd.py | 8 ++-- .../hosts/houdini/hooks/set_paths.py | 2 +- .../houdini/plugins/create/convert_legacy.py | 4 +- .../plugins/create/create_alembic_camera.py | 4 +- .../plugins/create/create_arnold_ass.py | 4 +- .../plugins/create/create_arnold_rop.py | 4 +- .../houdini/plugins/create/create_bgeo.py | 6 +-- .../plugins/create/create_composite.py | 4 +- .../houdini/plugins/create/create_hda.py | 4 +- .../plugins/create/create_karma_rop.py | 6 +-- .../plugins/create/create_mantra_ifd.py | 6 +-- .../plugins/create/create_mantra_rop.py | 6 +-- .../plugins/create/create_pointcache.py | 4 +- .../plugins/create/create_redshift_proxy.py | 4 +- .../plugins/create/create_redshift_rop.py | 4 +- .../houdini/plugins/create/create_review.py | 6 +-- .../plugins/create/create_staticmesh.py | 4 +- .../houdini/plugins/create/create_usd.py | 4 +- .../plugins/create/create_usdrender.py | 4 +- .../plugins/create/create_vbd_cache.py | 6 +-- .../houdini/plugins/create/create_vray_rop.py | 6 +-- .../houdini/plugins/create/create_workfile.py | 12 +++--- .../inventory/set_camera_resolution.py | 6 +-- .../hosts/houdini/plugins/load/actions.py | 2 +- .../houdini/plugins/load/load_alembic.py | 4 +- .../plugins/load/load_alembic_archive.py | 4 +- .../hosts/houdini/plugins/load/load_ass.py | 4 +- .../hosts/houdini/plugins/load/load_bgeo.py | 4 +- .../hosts/houdini/plugins/load/load_camera.py | 6 +-- .../hosts/houdini/plugins/load/load_fbx.py | 4 +- .../hosts/houdini/plugins/load/load_hda.py | 4 +- .../hosts/houdini/plugins/load/load_image.py | 4 +- .../plugins/load/load_redshift_proxy.py | 6 +-- .../houdini/plugins/load/load_usd_layer.py | 4 +- .../plugins/load/load_usd_reference.py | 4 +- .../hosts/houdini/plugins/load/load_vdb.py | 4 +- .../houdini/plugins/load/show_usdview.py | 4 +- .../plugins/publish/collect_arnold_rop.py | 4 +- .../plugins/publish/collect_asset_handles.py | 4 +- .../plugins/publish/collect_cache_farm.py | 2 +- .../plugins/publish/collect_chunk_size.py | 4 +- .../houdini/plugins/publish/collect_frames.py | 2 +- .../houdini/plugins/publish/collect_inputs.py | 2 +- .../plugins/publish/collect_instances.py | 2 +- .../publish/collect_instances_usd_layered.py | 6 +-- .../plugins/publish/collect_karma_rop.py | 4 +- .../plugins/publish/collect_mantra_rop.py | 4 +- .../plugins/publish/collect_output_node.py | 2 +- .../plugins/publish/collect_redshift_rop.py | 4 +- .../plugins/publish/collect_remote_publish.py | 4 +- .../publish/collect_rop_frame_range.py | 2 +- .../plugins/publish/collect_usd_bootstrap.py | 4 +- .../plugins/publish/collect_usd_layers.py | 2 +- .../plugins/publish/collect_vray_rop.py | 4 +- .../plugins/publish/extract_alembic.py | 4 +- .../houdini/plugins/publish/extract_ass.py | 4 +- .../houdini/plugins/publish/extract_bgeo.py | 6 +-- .../plugins/publish/extract_composite.py | 4 +- .../houdini/plugins/publish/extract_fbx.py | 4 +- .../houdini/plugins/publish/extract_hda.py | 2 +- .../plugins/publish/extract_mantra_ifd.py | 2 +- .../houdini/plugins/publish/extract_opengl.py | 4 +- .../plugins/publish/extract_redshift_proxy.py | 4 +- .../houdini/plugins/publish/extract_usd.py | 4 +- .../plugins/publish/extract_usd_layered.py | 8 ++-- .../plugins/publish/extract_vdb_cache.py | 4 +- .../plugins/publish/increment_current_file.py | 10 ++--- .../houdini/plugins/publish/save_scene.py | 2 +- .../validate_abc_primitive_to_detail.py | 2 +- .../publish/validate_alembic_input_node.py | 2 +- .../publish/validate_animation_settings.py | 4 +- .../plugins/publish/validate_bypass.py | 2 +- .../plugins/publish/validate_camera_rop.py | 2 +- .../publish/validate_cop_output_node.py | 2 +- .../publish/validate_fbx_output_node.py | 6 +-- .../publish/validate_file_extension.py | 4 +- .../plugins/publish/validate_frame_range.py | 6 +-- .../plugins/publish/validate_frame_token.py | 2 +- .../validate_houdini_license_category.py | 2 +- .../publish/validate_mesh_is_static.py | 8 ++-- .../publish/validate_mkpaths_toggled.py | 2 +- .../plugins/publish/validate_no_errors.py | 2 +- .../validate_primitive_hierarchy_paths.py | 4 +- .../publish/validate_remote_publish.py | 6 +-- .../validate_remote_publish_enabled.py | 4 +- .../publish/validate_review_colorspace.py | 8 ++-- .../plugins/publish/validate_scene_review.py | 2 +- .../publish/validate_sop_output_node.py | 4 +- .../plugins/publish/validate_subset_name.py | 8 ++-- .../validate_unreal_staticmesh_naming.py | 8 ++-- .../validate_usd_layer_path_backslashes.py | 4 +- .../publish/validate_usd_model_and_shade.py | 4 +- .../publish/validate_usd_output_node.py | 2 +- .../validate_usd_render_product_names.py | 2 +- .../plugins/publish/validate_usd_setdress.py | 4 +- .../validate_usd_shade_model_exists.py | 6 +-- .../publish/validate_usd_shade_workspace.py | 2 +- .../publish/validate_vdb_output_node.py | 4 +- .../publish/validate_workfile_paths.py | 4 +- .../hosts/houdini/startup/MainMenuCommon.xml | 20 +++++----- .../houdini/startup/python2.7libs/pythonrc.py | 6 +-- .../startup/python3.10libs/pythonrc.py | 6 +-- .../houdini/startup/python3.7libs/pythonrc.py | 6 +-- .../houdini/startup/python3.9libs/pythonrc.py | 6 +-- client/ayon_core/hosts/max/addon.py | 2 +- client/ayon_core/hosts/max/api/lib.py | 10 ++--- .../hosts/max/api/lib_renderproducts.py | 6 +-- .../hosts/max/api/lib_rendersettings.py | 10 ++--- client/ayon_core/hosts/max/api/menu.py | 4 +- client/ayon_core/hosts/max/api/pipeline.py | 12 +++--- client/ayon_core/hosts/max/api/plugin.py | 4 +- .../hosts/max/hooks/force_startup_script.py | 4 +- .../hosts/max/hooks/inject_python.py | 2 +- client/ayon_core/hosts/max/hooks/set_paths.py | 2 +- .../hosts/max/plugins/create/create_camera.py | 2 +- .../max/plugins/create/create_maxScene.py | 2 +- .../hosts/max/plugins/create/create_model.py | 2 +- .../max/plugins/create/create_pointcache.py | 2 +- .../max/plugins/create/create_pointcloud.py | 2 +- .../plugins/create/create_redshift_proxy.py | 4 +- .../hosts/max/plugins/create/create_render.py | 6 +-- .../hosts/max/plugins/create/create_review.py | 4 +- .../max/plugins/create/create_tycache.py | 2 +- .../hosts/max/plugins/load/load_camera_fbx.py | 8 ++-- .../hosts/max/plugins/load/load_max_scene.py | 8 ++-- .../hosts/max/plugins/load/load_model.py | 8 ++-- .../hosts/max/plugins/load/load_model_fbx.py | 10 ++--- .../hosts/max/plugins/load/load_model_obj.py | 10 ++--- .../hosts/max/plugins/load/load_model_usd.py | 12 +++--- .../hosts/max/plugins/load/load_pointcache.py | 8 ++-- .../plugins/load/load_pointcache_ornatrix.py | 10 ++--- .../hosts/max/plugins/load/load_pointcloud.py | 8 ++-- .../max/plugins/load/load_redshift_proxy.py | 10 ++--- .../hosts/max/plugins/load/load_tycache.py | 8 ++-- .../max/plugins/publish/collect_render.py | 10 ++--- .../max/plugins/publish/collect_review.py | 6 +-- .../publish/collect_tycache_attributes.py | 4 +- .../max/plugins/publish/extract_alembic.py | 8 ++-- .../hosts/max/plugins/publish/extract_fbx.py | 6 +-- .../plugins/publish/extract_max_scene_raw.py | 2 +- .../max/plugins/publish/extract_model_obj.py | 8 ++-- .../max/plugins/publish/extract_model_usd.py | 4 +- .../max/plugins/publish/extract_pointcloud.py | 4 +- .../plugins/publish/extract_redshift_proxy.py | 4 +- .../publish/extract_review_animation.py | 4 +- .../max/plugins/publish/extract_thumbnail.py | 4 +- .../max/plugins/publish/extract_tycache.py | 4 +- .../publish/increment_workfile_version.py | 2 +- .../publish/save_scenes_for_cameras.py | 6 +-- .../plugins/publish/validate_attributes.py | 2 +- .../publish/validate_camera_contents.py | 2 +- .../publish/validate_deadline_publish.py | 4 +- .../plugins/publish/validate_frame_range.py | 6 +-- .../publish/validate_instance_has_members.py | 2 +- .../plugins/publish/validate_loaded_plugin.py | 4 +- .../publish/validate_model_contents.py | 2 +- .../plugins/publish/validate_pointcloud.py | 2 +- .../publish/validate_renderable_camera.py | 6 +-- .../validate_renderer_redshift_proxy.py | 6 +-- .../publish/validate_resolution_setting.py | 6 +-- .../plugins/publish/validate_scene_saved.py | 2 +- .../plugins/publish/validate_tyflow_data.py | 2 +- client/ayon_core/hosts/max/startup/startup.py | 4 +- client/ayon_core/hosts/maya/addon.py | 2 +- client/ayon_core/hosts/maya/api/action.py | 4 +- client/ayon_core/hosts/maya/api/commands.py | 8 ++-- client/ayon_core/hosts/maya/api/customize.py | 4 +- client/ayon_core/hosts/maya/api/exitstack.py | 2 +- client/ayon_core/hosts/maya/api/fbx.py | 2 +- client/ayon_core/hosts/maya/api/lib.py | 18 ++++----- .../hosts/maya/api/lib_renderproducts.py | 2 +- .../hosts/maya/api/lib_rendersettings.py | 10 ++--- .../hosts/maya/api/lib_rendersetup.py | 2 +- client/ayon_core/hosts/maya/api/menu.py | 8 ++-- client/ayon_core/hosts/maya/api/pipeline.py | 22 +++++------ client/ayon_core/hosts/maya/api/plugin.py | 16 ++++---- client/ayon_core/hosts/maya/api/setdress.py | 6 +-- .../maya/api/shader_definition_editor.py | 4 +- .../maya/api/workfile_template_builder.py | 6 +-- .../hosts/maya/hooks/pre_auto_load_plugins.py | 2 +- .../hosts/maya/hooks/pre_copy_mel.py | 4 +- .../pre_open_workfile_post_initialization.py | 2 +- client/ayon_core/hosts/maya/lib.py | 4 +- .../maya/plugins/create/convert_legacy.py | 8 ++-- .../maya/plugins/create/create_animation.py | 4 +- .../create/create_arnold_scene_source.py | 4 +- .../maya/plugins/create/create_assembly.py | 2 +- .../maya/plugins/create/create_camera.py | 4 +- .../maya/plugins/create/create_layout.py | 4 +- .../hosts/maya/plugins/create/create_look.py | 4 +- .../maya/plugins/create/create_matchmove.py | 4 +- .../maya/plugins/create/create_maya_usd.py | 4 +- .../maya/plugins/create/create_mayascene.py | 2 +- .../hosts/maya/plugins/create/create_model.py | 4 +- .../plugins/create/create_multishot_layout.py | 12 +++--- .../plugins/create/create_multiverse_look.py | 4 +- .../plugins/create/create_multiverse_usd.py | 4 +- .../create/create_multiverse_usd_comp.py | 4 +- .../create/create_multiverse_usd_over.py | 4 +- .../maya/plugins/create/create_pointcache.py | 4 +- .../maya/plugins/create/create_proxy_abc.py | 4 +- .../plugins/create/create_redshift_proxy.py | 4 +- .../maya/plugins/create/create_render.py | 6 +-- .../maya/plugins/create/create_rendersetup.py | 4 +- .../maya/plugins/create/create_review.py | 10 ++--- .../hosts/maya/plugins/create/create_rig.py | 2 +- .../maya/plugins/create/create_setdress.py | 4 +- .../create/create_unreal_skeletalmesh.py | 4 +- .../create/create_unreal_staticmesh.py | 2 +- .../plugins/create/create_unreal_yeticache.py | 4 +- .../maya/plugins/create/create_vrayproxy.py | 4 +- .../maya/plugins/create/create_vrayscene.py | 6 +-- .../maya/plugins/create/create_workfile.py | 8 ++-- .../hosts/maya/plugins/create/create_xgen.py | 2 +- .../maya/plugins/create/create_yeti_cache.py | 4 +- .../maya/plugins/create/create_yeti_rig.py | 2 +- .../plugins/inventory/connect_geometry.py | 4 +- .../maya/plugins/inventory/connect_xgen.py | 2 +- .../plugins/inventory/connect_yeti_rig.py | 4 +- .../plugins/inventory/import_modelrender.py | 6 +-- .../plugins/inventory/import_reference.py | 4 +- .../rig_recreate_animation_instance.py | 4 +- .../plugins/inventory/select_containers.py | 4 +- .../maya/plugins/load/_load_animation.py | 4 +- .../hosts/maya/plugins/load/actions.py | 6 +-- .../maya/plugins/load/load_arnold_standin.py | 8 ++-- .../hosts/maya/plugins/load/load_assembly.py | 8 ++-- .../hosts/maya/plugins/load/load_audio.py | 6 +-- .../hosts/maya/plugins/load/load_gpucache.py | 8 ++-- .../hosts/maya/plugins/load/load_image.py | 14 +++---- .../maya/plugins/load/load_image_plane.py | 8 ++-- .../hosts/maya/plugins/load/load_look.py | 12 +++--- .../hosts/maya/plugins/load/load_matchmove.py | 2 +- .../hosts/maya/plugins/load/load_maya_usd.py | 8 ++-- .../maya/plugins/load/load_multiverse_usd.py | 8 ++-- .../plugins/load/load_multiverse_usd_over.py | 8 ++-- .../maya/plugins/load/load_redshift_proxy.py | 8 ++-- .../hosts/maya/plugins/load/load_reference.py | 6 +-- .../maya/plugins/load/load_rendersetup.py | 8 ++-- .../maya/plugins/load/load_vdb_to_arnold.py | 8 ++-- .../maya/plugins/load/load_vdb_to_redshift.py | 8 ++-- .../maya/plugins/load/load_vdb_to_vray.py | 10 ++--- .../hosts/maya/plugins/load/load_vrayproxy.py | 10 ++--- .../hosts/maya/plugins/load/load_vrayscene.py | 8 ++-- .../hosts/maya/plugins/load/load_xgen.py | 8 ++-- .../maya/plugins/load/load_yeti_cache.py | 8 ++-- .../hosts/maya/plugins/load/load_yeti_rig.py | 6 +-- .../publish/collect_arnold_scene_source.py | 2 +- .../maya/plugins/publish/collect_assembly.py | 4 +- .../plugins/publish/collect_fbx_animation.py | 2 +- .../maya/plugins/publish/collect_inputs.py | 6 +-- .../maya/plugins/publish/collect_instances.py | 2 +- .../maya/plugins/publish/collect_look.py | 2 +- .../publish/collect_multiverse_look.py | 2 +- .../maya/plugins/publish/collect_render.py | 8 ++-- .../publish/collect_render_layer_aovs.py | 2 +- .../publish/collect_renderable_camera.py | 2 +- .../maya/plugins/publish/collect_review.py | 6 +-- .../maya/plugins/publish/collect_vrayscene.py | 6 +-- .../maya/plugins/publish/collect_xgen.py | 2 +- .../plugins/publish/collect_yeti_cache.py | 2 +- .../maya/plugins/publish/collect_yeti_rig.py | 4 +- .../publish/extract_active_view_thumbnail.py | 2 +- .../publish/extract_arnold_scene_source.py | 4 +- .../maya/plugins/publish/extract_assembly.py | 4 +- .../plugins/publish/extract_camera_alembic.py | 4 +- .../publish/extract_camera_mayaScene.py | 6 +-- .../hosts/maya/plugins/publish/extract_fbx.py | 6 +-- .../plugins/publish/extract_fbx_animation.py | 6 +-- .../maya/plugins/publish/extract_gltf.py | 6 +-- .../maya/plugins/publish/extract_gpu_cache.py | 2 +- .../publish/extract_import_reference.py | 8 ++-- .../maya/plugins/publish/extract_layout.py | 4 +- .../maya/plugins/publish/extract_look.py | 8 ++-- .../plugins/publish/extract_maya_scene_raw.py | 8 ++-- .../maya/plugins/publish/extract_maya_usd.py | 4 +- .../maya/plugins/publish/extract_model.py | 4 +- .../publish/extract_multiverse_look.py | 4 +- .../plugins/publish/extract_multiverse_usd.py | 4 +- .../publish/extract_multiverse_usd_comp.py | 4 +- .../publish/extract_multiverse_usd_over.py | 4 +- .../hosts/maya/plugins/publish/extract_obj.py | 4 +- .../maya/plugins/publish/extract_playblast.py | 4 +- .../plugins/publish/extract_pointcache.py | 4 +- .../maya/plugins/publish/extract_proxy_abc.py | 4 +- .../plugins/publish/extract_redshift_proxy.py | 4 +- .../plugins/publish/extract_rendersetup.py | 2 +- .../hosts/maya/plugins/publish/extract_rig.py | 4 +- .../plugins/publish/extract_skeleton_mesh.py | 6 +-- .../maya/plugins/publish/extract_thumbnail.py | 4 +- .../extract_unreal_skeletalmesh_abc.py | 4 +- .../extract_unreal_skeletalmesh_fbx.py | 4 +- .../publish/extract_unreal_staticmesh.py | 6 +-- .../publish/extract_unreal_yeticache.py | 2 +- .../maya/plugins/publish/extract_vrayproxy.py | 4 +- .../maya/plugins/publish/extract_vrayscene.py | 6 +-- .../plugins/publish/extract_workfile_xgen.py | 6 +-- .../maya/plugins/publish/extract_xgen.py | 6 +-- .../plugins/publish/extract_yeti_cache.py | 2 +- .../maya/plugins/publish/extract_yeti_rig.py | 4 +- .../increment_current_file_deadline.py | 4 +- .../hosts/maya/plugins/publish/save_scene.py | 2 +- .../publish/validate_animated_reference.py | 4 +- .../publish/validate_animation_content.py | 4 +- ...date_animation_out_set_related_node_ids.py | 6 +-- .../publish/validate_arnold_scene_source.py | 2 +- .../validate_arnold_scene_source_cbid.py | 4 +- .../publish/validate_ass_relative_paths.py | 2 +- .../plugins/publish/validate_assembly_name.py | 4 +- .../publish/validate_assembly_namespaces.py | 4 +- .../publish/validate_assembly_transforms.py | 8 ++-- .../plugins/publish/validate_attributes.py | 4 +- .../publish/validate_camera_attributes.py | 4 +- .../publish/validate_camera_contents.py | 4 +- .../plugins/publish/validate_color_sets.py | 4 +- ...validate_current_renderlayer_renderable.py | 2 +- .../plugins/publish/validate_cycle_error.py | 6 +-- .../plugins/publish/validate_frame_range.py | 4 +- .../plugins/publish/validate_glsl_material.py | 4 +- .../plugins/publish/validate_glsl_plugin.py | 2 +- .../publish/validate_instance_has_members.py | 4 +- .../publish/validate_instance_in_context.py | 6 +-- .../publish/validate_instance_subset.py | 2 +- .../publish/validate_instancer_content.py | 4 +- .../validate_instancer_frame_ranges.py | 2 +- .../plugins/publish/validate_loaded_plugin.py | 2 +- .../plugins/publish/validate_look_contents.py | 4 +- ...lidate_look_default_shaders_connections.py | 2 +- .../validate_look_id_reference_edits.py | 4 +- .../validate_look_no_default_shaders.py | 4 +- .../plugins/publish/validate_look_sets.py | 6 +-- .../publish/validate_look_shading_group.py | 4 +- .../publish/validate_look_single_shader.py | 4 +- .../plugins/publish/validate_maya_units.py | 6 +-- .../validate_mesh_arnold_attributes.py | 6 +-- .../plugins/publish/validate_mesh_empty.py | 4 +- .../plugins/publish/validate_mesh_has_uv.py | 6 +-- .../publish/validate_mesh_lamina_faces.py | 4 +- .../plugins/publish/validate_mesh_ngons.py | 6 +-- .../validate_mesh_no_negative_scale.py | 4 +- .../publish/validate_mesh_non_manifold.py | 4 +- .../publish/validate_mesh_non_zero_edge.py | 6 +-- .../publish/validate_mesh_normals_unlocked.py | 4 +- .../publish/validate_mesh_overlapping_uvs.py | 4 +- .../validate_mesh_shader_connections.py | 4 +- .../publish/validate_mesh_single_uv_set.py | 6 +-- .../publish/validate_mesh_uv_set_map1.py | 4 +- .../validate_mesh_vertices_have_edges.py | 6 +-- .../plugins/publish/validate_model_content.py | 6 +-- .../plugins/publish/validate_model_name.py | 10 ++--- .../publish/validate_mvlook_contents.py | 4 +- .../plugins/publish/validate_no_animation.py | 4 +- .../publish/validate_no_default_camera.py | 4 +- .../plugins/publish/validate_no_namespace.py | 4 +- .../publish/validate_no_null_transforms.py | 4 +- .../publish/validate_no_unknown_nodes.py | 4 +- .../plugins/publish/validate_no_vraymesh.py | 2 +- .../maya/plugins/publish/validate_node_ids.py | 6 +-- .../validate_node_ids_deformed_shapes.py | 6 +-- .../publish/validate_node_ids_in_database.py | 10 ++--- .../publish/validate_node_ids_related.py | 6 +-- .../publish/validate_node_ids_unique.py | 6 +-- .../publish/validate_node_no_ghosting.py | 4 +- .../validate_plugin_path_attributes.py | 6 +-- .../publish/validate_render_image_rule.py | 2 +- .../validate_render_no_default_cameras.py | 4 +- .../publish/validate_render_single_camera.py | 6 +-- .../publish/validate_renderlayer_aovs.py | 8 ++-- .../publish/validate_rendersettings.py | 6 +-- .../plugins/publish/validate_resolution.py | 8 ++-- .../plugins/publish/validate_resources.py | 2 +- .../maya/plugins/publish/validate_review.py | 2 +- .../plugins/publish/validate_rig_contents.py | 4 +- .../publish/validate_rig_controllers.py | 6 +-- ...idate_rig_controllers_arnold_attributes.py | 6 +-- .../publish/validate_rig_joints_hidden.py | 6 +-- .../publish/validate_rig_out_set_node_ids.py | 6 +-- .../publish/validate_rig_output_ids.py | 6 +-- .../publish/validate_scene_set_workspace.py | 2 +- .../plugins/publish/validate_setdress_root.py | 2 +- .../plugins/publish/validate_shader_name.py | 4 +- .../publish/validate_shape_default_names.py | 4 +- .../publish/validate_shape_render_stats.py | 4 +- .../plugins/publish/validate_shape_zero.py | 6 +-- .../publish/validate_single_assembly.py | 2 +- .../validate_skeletalmesh_hierarchy.py | 2 +- .../validate_skeletalmesh_triangulated.py | 4 +- .../validate_skeleton_top_group_hierarchy.py | 2 +- .../validate_skinCluster_deformer_set.py | 4 +- .../plugins/publish/validate_step_size.py | 4 +- .../validate_transform_naming_suffix.py | 4 +- .../publish/validate_transform_zero.py | 4 +- .../plugins/publish/validate_unique_names.py | 4 +- .../validate_unreal_mesh_triangulated.py | 4 +- .../validate_unreal_staticmesh_naming.py | 8 ++-- .../publish/validate_unreal_up_axis.py | 2 +- .../plugins/publish/validate_visible_only.py | 6 +-- .../maya/plugins/publish/validate_vray.py | 2 +- .../validate_vray_distributed_rendering.py | 4 +- .../publish/validate_vray_referenced_aovs.py | 2 +- .../validate_vray_translator_settings.py | 2 +- .../plugins/publish/validate_vrayproxy.py | 2 +- .../publish/validate_vrayproxy_members.py | 4 +- .../maya/plugins/publish/validate_xgen.py | 2 +- .../validate_yeti_renderscript_callbacks.py | 2 +- .../publish/validate_yeti_rig_cache_state.py | 4 +- .../validate_yeti_rig_input_in_instance.py | 4 +- .../publish/validate_yeti_rig_settings.py | 2 +- .../ayon_core/hosts/maya/startup/userSetup.py | 6 +-- client/ayon_core/hosts/maya/tools/__init__.py | 2 +- .../hosts/maya/tools/mayalookassigner/app.py | 10 ++--- .../tools/mayalookassigner/arnold_standin.py | 6 +-- .../maya/tools/mayalookassigner/commands.py | 6 +-- .../hosts/maya/tools/mayalookassigner/lib.py | 6 +-- .../maya/tools/mayalookassigner/models.py | 4 +- .../tools/mayalookassigner/vray_proxies.py | 6 +-- .../maya/tools/mayalookassigner/widgets.py | 6 +-- client/ayon_core/hosts/nuke/addon.py | 2 +- client/ayon_core/hosts/nuke/api/actions.py | 2 +- client/ayon_core/hosts/nuke/api/gizmo_menu.py | 2 +- client/ayon_core/hosts/nuke/api/lib.py | 28 +++++++------- client/ayon_core/hosts/nuke/api/pipeline.py | 17 ++++----- client/ayon_core/hosts/nuke/api/plugin.py | 12 +++--- client/ayon_core/hosts/nuke/api/utils.py | 2 +- .../nuke/api/workfile_template_builder.py | 6 +-- .../hosts/nuke/hooks/pre_nukeassist_setup.py | 2 +- .../nuke/plugins/create/convert_legacy.py | 6 +-- .../nuke/plugins/create/create_backdrop.py | 2 +- .../nuke/plugins/create/create_camera.py | 4 +- .../hosts/nuke/plugins/create/create_gizmo.py | 2 +- .../hosts/nuke/plugins/create/create_model.py | 2 +- .../nuke/plugins/create/create_source.py | 4 +- .../nuke/plugins/create/create_write_image.py | 8 ++-- .../plugins/create/create_write_prerender.py | 8 ++-- .../plugins/create/create_write_render.py | 8 ++-- .../nuke/plugins/create/workfile_creator.py | 8 ++-- .../plugins/inventory/repair_old_loaders.py | 6 +-- .../plugins/inventory/select_containers.py | 4 +- .../hosts/nuke/plugins/load/actions.py | 8 ++-- .../hosts/nuke/plugins/load/load_backdrop.py | 10 ++--- .../nuke/plugins/load/load_camera_abc.py | 8 ++-- .../hosts/nuke/plugins/load/load_clip.py | 14 +++---- .../hosts/nuke/plugins/load/load_effects.py | 6 +-- .../nuke/plugins/load/load_effects_ip.py | 8 ++-- .../hosts/nuke/plugins/load/load_gizmo.py | 8 ++-- .../hosts/nuke/plugins/load/load_gizmo_ip.py | 8 ++-- .../hosts/nuke/plugins/load/load_image.py | 10 ++--- .../hosts/nuke/plugins/load/load_matchmove.py | 2 +- .../hosts/nuke/plugins/load/load_model.py | 8 ++-- .../hosts/nuke/plugins/load/load_ociolook.py | 6 +-- .../nuke/plugins/load/load_script_precomp.py | 8 ++-- .../nuke/plugins/publish/collect_backdrop.py | 2 +- .../plugins/publish/collect_context_data.py | 6 +-- .../nuke/plugins/publish/collect_writes.py | 4 +- .../nuke/plugins/publish/extract_backdrop.py | 4 +- .../nuke/plugins/publish/extract_camera.py | 4 +- .../nuke/plugins/publish/extract_gizmo.py | 6 +-- .../nuke/plugins/publish/extract_model.py | 4 +- .../plugins/publish/extract_ouput_node.py | 2 +- .../plugins/publish/extract_render_local.py | 6 +-- .../plugins/publish/extract_review_data.py | 2 +- .../publish/extract_review_data_lut.py | 6 +-- .../publish/extract_review_intermediates.py | 6 +-- .../plugins/publish/extract_slate_frame.py | 4 +- .../publish/increment_script_version.py | 2 +- .../plugins/publish/validate_asset_context.py | 4 +- .../nuke/plugins/publish/validate_backdrop.py | 4 +- .../plugins/publish/validate_exposed_knobs.py | 6 +-- .../nuke/plugins/publish/validate_gizmo.py | 4 +- .../nuke/plugins/publish/validate_knobs.py | 2 +- .../publish/validate_output_resolution.py | 6 +-- .../plugins/publish/validate_proxy_mode.py | 2 +- .../publish/validate_rendered_frames.py | 4 +- .../publish/validate_script_attributes.py | 6 +-- .../plugins/publish/validate_write_nodes.py | 6 +-- .../hosts/nuke/startup/clear_rendered.py | 2 +- .../hosts/nuke/startup/custom_write_node.py | 4 +- client/ayon_core/hosts/nuke/startup/menu.py | 4 +- .../hosts/nuke/startup/write_to_read.py | 2 +- client/ayon_core/hosts/photoshop/addon.py | 2 +- .../ayon_core/hosts/photoshop/api/README.md | 8 ++-- .../hosts/photoshop/api/launch_logic.py | 16 ++++---- client/ayon_core/hosts/photoshop/api/lib.py | 14 +++---- .../ayon_core/hosts/photoshop/api/pipeline.py | 12 +++--- .../ayon_core/hosts/photoshop/api/plugin.py | 2 +- .../ayon_core/hosts/photoshop/api/ws_stub.py | 2 +- client/ayon_core/hosts/photoshop/lib.py | 12 +++--- .../plugins/create/create_flatten_image.py | 16 ++++---- .../photoshop/plugins/create/create_image.py | 14 +++---- .../photoshop/plugins/create/create_review.py | 2 +- .../plugins/create/create_workfile.py | 2 +- .../photoshop/plugins/load/load_image.py | 6 +-- .../plugins/load/load_image_from_sequence.py | 4 +- .../photoshop/plugins/load/load_reference.py | 6 +-- .../photoshop/plugins/publish/closePS.py | 2 +- .../plugins/publish/collect_auto_image.py | 6 +-- .../publish/collect_auto_image_refresh.py | 2 +- .../plugins/publish/collect_auto_review.py | 6 +-- .../plugins/publish/collect_auto_workfile.py | 6 +-- .../plugins/publish/collect_batch_data.py | 4 +- .../publish/collect_color_coded_instances.py | 8 ++-- .../plugins/publish/collect_current_file.py | 2 +- .../publish/collect_extension_version.py | 2 +- .../plugins/publish/collect_image.py | 2 +- .../publish/collect_published_version.py | 4 +- .../plugins/publish/collect_review.py | 2 +- .../plugins/publish/collect_workfile.py | 2 +- .../plugins/publish/extract_image.py | 6 +-- .../plugins/publish/extract_review.py | 6 +-- .../plugins/publish/extract_save_scene.py | 4 +- .../plugins/publish/increment_workfile.py | 6 +-- .../publish/validate_instance_asset.py | 6 +-- .../plugins/publish/validate_naming.py | 6 +-- client/ayon_core/hosts/resolve/addon.py | 2 +- client/ayon_core/hosts/resolve/api/action.py | 2 +- client/ayon_core/hosts/resolve/api/lib.py | 4 +- client/ayon_core/hosts/resolve/api/menu.py | 4 +- .../ayon_core/hosts/resolve/api/pipeline.py | 8 ++-- client/ayon_core/hosts/resolve/api/plugin.py | 4 +- client/ayon_core/hosts/resolve/api/utils.py | 4 +- client/ayon_core/hosts/resolve/api/workio.py | 2 +- .../hooks/pre_resolve_last_workfile.py | 2 +- .../hosts/resolve/hooks/pre_resolve_setup.py | 4 +- .../resolve/hooks/pre_resolve_startup.py | 4 +- .../plugins/create/create_shot_clip.py | 4 +- .../hosts/resolve/plugins/load/load_clip.py | 10 ++--- .../plugins/publish/extract_workfile.py | 4 +- .../plugins/publish/precollect_instances.py | 4 +- .../plugins/publish/precollect_workfile.py | 8 ++-- client/ayon_core/hosts/resolve/startup.py | 10 ++--- .../resolve/utility_scripts/AYON__Menu.py | 6 +-- .../resolve/utility_scripts/OpenPype__Menu.py | 6 +-- .../utility_scripts/develop/OTIO_export.py | 2 +- .../utility_scripts/develop/OTIO_import.py | 2 +- .../develop/OpenPype_sync_util_scripts.py | 6 +-- client/ayon_core/hosts/resolve/utils.py | 4 +- .../hosts/standalonepublisher/addon.py | 8 ++-- .../publish/collect_bulk_mov_instances.py | 4 +- .../plugins/publish/collect_context.py | 2 +- .../plugins/publish/collect_editorial.py | 4 +- .../publish/collect_editorial_instances.py | 4 +- .../plugins/publish/collect_hierarchy.py | 2 +- .../plugins/publish/collect_matching_asset.py | 2 +- .../plugins/publish/collect_texture.py | 2 +- .../plugins/publish/extract_thumbnail.py | 2 +- .../publish/validate_editorial_resources.py | 2 +- .../plugins/publish/validate_frame_ranges.py | 4 +- .../publish/validate_shot_duplicates.py | 2 +- .../plugins/publish/validate_sources.py | 2 +- .../publish/validate_task_existence.py | 4 +- .../plugins/publish/validate_texture_batch.py | 2 +- .../publish/validate_texture_has_workfile.py | 2 +- .../plugins/publish/validate_texture_name.py | 2 +- .../publish/validate_texture_versions.py | 2 +- .../publish/validate_texture_workfiles.py | 2 +- .../ayon_core/hosts/substancepainter/addon.py | 2 +- .../hosts/substancepainter/api/pipeline.py | 20 +++++----- .../deploy/plugins/openpype_plugin.py | 6 +-- .../plugins/create/create_textures.py | 8 ++-- .../plugins/create/create_workfile.py | 8 ++-- .../plugins/load/load_mesh.py | 8 ++-- .../plugins/publish/collect_current_file.py | 2 +- .../publish/collect_textureset_images.py | 8 ++-- .../plugins/publish/extract_textures.py | 2 +- .../plugins/publish/increment_workfile.py | 4 +- .../plugins/publish/save_workfile.py | 2 +- .../plugins/publish/validate_ouput_maps.py | 2 +- client/ayon_core/hosts/traypublisher/addon.py | 8 ++-- .../hosts/traypublisher/api/editorial.py | 4 +- .../hosts/traypublisher/api/pipeline.py | 4 +- .../hosts/traypublisher/api/plugin.py | 10 ++--- .../hosts/traypublisher/batch_parsing.py | 4 +- .../plugins/create/create_colorspace_look.py | 12 +++--- .../plugins/create/create_editorial.py | 12 +++--- .../plugins/create/create_from_settings.py | 6 +-- .../plugins/create/create_movie_batch.py | 14 +++---- .../plugins/create/create_online.py | 8 ++-- .../publish/collect_colorspace_look.py | 4 +- .../publish/collect_explicit_colorspace.py | 8 ++-- .../plugins/publish/collect_movie_batch.py | 2 +- .../publish/collect_sequence_frame_data.py | 2 +- .../plugins/publish/collect_shot_instances.py | 2 +- .../publish/extract_colorspace_look.py | 2 +- .../plugins/publish/validate_colorspace.py | 4 +- .../publish/validate_colorspace_look.py | 2 +- .../publish/validate_existing_version.py | 2 +- .../plugins/publish/validate_filepaths.py | 2 +- .../plugins/publish/validate_frame_ranges.py | 2 +- .../plugins/publish/validate_online_file.py | 4 +- client/ayon_core/hosts/tvpaint/addon.py | 2 +- .../hosts/tvpaint/api/communication_server.py | 8 ++-- .../hosts/tvpaint/api/launch_script.py | 6 +-- .../ayon_core/hosts/tvpaint/api/pipeline.py | 14 +++---- client/ayon_core/hosts/tvpaint/api/plugin.py | 6 +-- .../hosts/tvpaint/hooks/pre_launch_args.py | 6 +-- .../tvpaint/plugins/create/convert_legacy.py | 6 +-- .../tvpaint/plugins/create/create_render.py | 12 +++--- .../tvpaint/plugins/create/create_review.py | 8 ++-- .../tvpaint/plugins/create/create_workfile.py | 8 ++-- .../hosts/tvpaint/plugins/load/load_image.py | 6 +-- .../plugins/load/load_reference_image.py | 10 ++--- .../hosts/tvpaint/plugins/load/load_sound.py | 4 +- .../tvpaint/plugins/load/load_workfile.py | 16 ++++---- .../publish/collect_render_instances.py | 2 +- .../plugins/publish/collect_workfile_data.py | 6 +-- .../plugins/publish/extract_convert_to_exr.py | 4 +- .../plugins/publish/extract_sequence.py | 6 +-- .../publish/increment_workfile_version.py | 4 +- .../plugins/publish/validate_asset_name.py | 6 +-- .../validate_duplicated_layer_names.py | 2 +- .../publish/validate_layers_visibility.py | 2 +- .../tvpaint/plugins/publish/validate_marks.py | 4 +- .../publish/validate_missing_layer_names.py | 2 +- .../publish/validate_render_layer_group.py | 2 +- .../publish/validate_render_pass_group.py | 2 +- .../publish/validate_scene_settings.py | 2 +- .../plugins/publish/validate_start_frame.py | 4 +- .../publish/validate_workfile_metadata.py | 2 +- .../publish/validate_workfile_project_name.py | 2 +- .../ayon_core/hosts/tvpaint/worker/worker.py | 2 +- .../hosts/tvpaint/worker/worker_job.py | 6 +-- client/ayon_core/hosts/unreal/addon.py | 4 +- client/ayon_core/hosts/unreal/api/pipeline.py | 14 +++---- client/ayon_core/hosts/unreal/api/plugin.py | 4 +- .../ayon_core/hosts/unreal/api/rendering.py | 8 ++-- client/ayon_core/hosts/unreal/api/tools_ui.py | 8 ++-- .../unreal/hooks/pre_workfile_preparation.py | 12 +++--- client/ayon_core/hosts/unreal/lib.py | 2 +- .../unreal/plugins/create/create_camera.py | 6 +-- .../unreal/plugins/create/create_layout.py | 2 +- .../unreal/plugins/create/create_look.py | 8 ++-- .../unreal/plugins/create/create_render.py | 6 +-- .../plugins/create/create_staticmeshfbx.py | 2 +- .../unreal/plugins/create/create_uasset.py | 4 +- .../plugins/inventory/delete_unused_assets.py | 10 ++--- .../unreal/plugins/inventory/update_actors.py | 4 +- .../plugins/load/load_alembic_animation.py | 6 +-- .../unreal/plugins/load/load_animation.py | 8 ++-- .../hosts/unreal/plugins/load/load_camera.py | 8 ++-- .../plugins/load/load_geometrycache_abc.py | 6 +-- .../hosts/unreal/plugins/load/load_layout.py | 12 +++--- .../plugins/load/load_layout_existing.py | 8 ++-- .../plugins/load/load_skeletalmesh_abc.py | 6 +-- .../plugins/load/load_skeletalmesh_fbx.py | 6 +-- .../plugins/load/load_staticmesh_abc.py | 6 +-- .../plugins/load/load_staticmesh_fbx.py | 6 +-- .../hosts/unreal/plugins/load/load_uasset.py | 6 +-- .../unreal/plugins/load/load_yeticache.py | 6 +-- .../publish/collect_render_instances.py | 6 +-- .../unreal/plugins/publish/extract_camera.py | 4 +- .../unreal/plugins/publish/extract_layout.py | 4 +- .../unreal/plugins/publish/extract_look.py | 2 +- .../unreal/plugins/publish/extract_uasset.py | 2 +- .../publish/validate_sequence_frames.py | 2 +- client/ayon_core/hosts/unreal/ue_workers.py | 4 +- .../hosts/unreal/ui/splash_screen.py | 2 +- client/ayon_core/hosts/webpublisher/addon.py | 2 +- .../hosts/webpublisher/api/__init__.py | 4 +- client/ayon_core/hosts/webpublisher/lib.py | 8 ++-- .../plugins/publish/collect_batch_data.py | 2 +- .../publish/collect_published_files.py | 8 ++-- .../publish/collect_tvpaint_instances.py | 2 +- .../publish/collect_tvpaint_workfile_data.py | 2 +- .../publish/extract_tvpaint_workfile.py | 4 +- .../hosts/webpublisher/publish_functions.py | 8 ++-- .../webserver_service/webpublish_routes.py | 6 +-- .../webserver_service/webserver.py | 6 +-- client/ayon_core/lib/__init__.py | 4 +- client/ayon_core/lib/applications.py | 31 +++++++-------- client/ayon_core/lib/execute.py | 2 +- client/ayon_core/lib/file_transaction.py | 2 +- client/ayon_core/lib/local_settings.py | 8 ++-- client/ayon_core/lib/log.py | 4 +- client/ayon_core/lib/openpype_version.py | 6 +-- client/ayon_core/lib/project_backpack.py | 2 +- client/ayon_core/lib/pype_info.py | 4 +- client/ayon_core/lib/terminal.py | 2 +- client/ayon_core/lib/usdlib.py | 4 +- client/ayon_core/lib/vendor_bin_utils.py | 2 +- .../modules/avalon_apps/avalon_app.py | 12 +++--- .../ayon_core/modules/avalon_apps/rest_api.py | 2 +- client/ayon_core/modules/base.py | 12 +++--- client/ayon_core/modules/click_wrap.py | 10 ++--- .../modules/clockify/clockify_api.py | 4 +- .../modules/clockify/clockify_module.py | 4 +- .../launcher_actions/ClockifyStart.py | 4 +- .../clockify/launcher_actions/ClockifySync.py | 4 +- client/ayon_core/modules/clockify/widgets.py | 2 +- .../deadline/abstract_submit_deadline.py | 6 +-- .../modules/deadline/deadline_module.py | 4 +- .../collect_deadline_server_from_instance.py | 2 +- .../collect_default_deadline_server.py | 2 +- .../deadline/plugins/publish/collect_pools.py | 4 +- .../publish/collect_publishable_instances.py | 2 +- .../publish/submit_aftereffects_deadline.py | 8 ++-- .../publish/submit_blender_deadline.py | 10 ++--- .../plugins/publish/submit_fusion_deadline.py | 10 ++--- .../publish/submit_harmony_deadline.py | 6 +-- .../publish/submit_houdini_cache_deadline.py | 8 ++-- .../publish/submit_houdini_remote_publish.py | 6 +-- .../publish/submit_houdini_render_deadline.py | 6 +-- .../plugins/publish/submit_max_deadline.py | 18 ++++----- .../plugins/publish/submit_maya_deadline.py | 14 +++---- .../submit_maya_remote_publish_deadline.py | 8 ++-- .../plugins/publish/submit_nuke_deadline.py | 10 ++--- .../publish/submit_publish_cache_job.py | 14 +++---- .../plugins/publish/submit_publish_job.py | 14 +++---- .../publish/validate_deadline_pools.py | 4 +- .../validate_expected_and_rendered_files.py | 2 +- .../custom/plugins/OpenPype/OpenPype.py | 2 +- client/ayon_core/modules/interfaces.py | 2 +- client/ayon_core/modules/job_queue/module.py | 8 ++-- client/ayon_core/modules/launcher_action.py | 12 +++--- .../modules/log_viewer/log_view_module.py | 4 +- .../ayon_core/modules/log_viewer/tray/app.py | 2 +- .../modules/log_viewer/tray/models.py | 2 +- .../python_console_interpreter/module.py | 2 +- .../window/widgets.py | 8 ++-- client/ayon_core/modules/royalrender/api.py | 6 +-- client/ayon_core/modules/royalrender/lib.py | 16 ++++---- .../publish/collect_sequences_from_job.py | 2 +- .../publish/create_maya_royalrender_job.py | 4 +- .../publish/create_nuke_royalrender_job.py | 2 +- .../publish/create_publish_royalrender_job.py | 10 ++--- .../publish/submit_jobs_to_royalrender.py | 4 +- .../royalrender/royal_render_module.py | 4 +- .../perjob/m50__openpype_publish_render.py | 2 +- .../modules/timers_manager/idle_threads.py | 2 +- .../launch_hooks/post_start_timer.py | 2 +- .../modules/timers_manager/rest_api.py | 2 +- .../modules/timers_manager/timers_manager.py | 6 +-- .../timers_manager/widget_user_idle.py | 2 +- .../webserver/host_console_listener.py | 4 +- client/ayon_core/modules/webserver/server.py | 2 +- .../modules/webserver/webserver_module.py | 4 +- client/ayon_core/pipeline/actions.py | 2 +- client/ayon_core/pipeline/anatomy.py | 14 +++---- client/ayon_core/pipeline/colorspace.py | 24 ++++++------ client/ayon_core/pipeline/context_tools.py | 18 ++++----- client/ayon_core/pipeline/create/context.py | 18 ++++----- .../pipeline/create/creator_plugins.py | 8 ++-- .../pipeline/create/legacy_create.py | 4 +- .../ayon_core/pipeline/create/subset_name.py | 6 +-- client/ayon_core/pipeline/create/utils.py | 2 +- client/ayon_core/pipeline/delivery.py | 2 +- .../pipeline/farm/pyblish_functions.py | 10 ++--- .../pipeline/farm/pyblish_functions.pyi | 2 +- client/ayon_core/pipeline/legacy_io.py | 2 +- client/ayon_core/pipeline/load/plugins.py | 8 ++-- client/ayon_core/pipeline/load/utils.py | 12 +++--- client/ayon_core/pipeline/mongodb.py | 4 +- client/ayon_core/pipeline/plugin_discover.py | 4 +- client/ayon_core/pipeline/project_folders.py | 4 +- client/ayon_core/pipeline/publish/README.md | 2 +- client/ayon_core/pipeline/publish/lib.py | 8 ++-- .../pipeline/publish/publish_plugins.py | 6 +-- client/ayon_core/pipeline/tempdir.py | 4 +- client/ayon_core/pipeline/template_data.py | 6 +-- client/ayon_core/pipeline/thumbnail.py | 8 ++-- client/ayon_core/pipeline/version_start.py | 4 +- .../pipeline/workfile/build_workfile.py | 14 +++---- .../pipeline/workfile/lock_workfile.py | 8 ++-- .../pipeline/workfile/path_resolving.py | 10 ++--- .../workfile/workfile_template_builder.py | 20 +++++----- .../plugins/actions/open_file_explorer.py | 6 +-- .../plugins/inventory/remove_and_load.py | 10 ++--- client/ayon_core/plugins/load/copy_file.py | 4 +- .../ayon_core/plugins/load/copy_file_path.py | 2 +- .../plugins/load/delete_old_versions.py | 12 +++--- client/ayon_core/plugins/load/delivery.py | 12 +++--- client/ayon_core/plugins/load/open_djv.py | 4 +- client/ayon_core/plugins/load/open_file.py | 2 +- .../ayon_core/plugins/load/push_to_library.py | 12 +++--- client/ayon_core/plugins/publish/cleanup.py | 2 +- .../publish/collect_anatomy_context_data.py | 2 +- .../publish/collect_anatomy_instance_data.py | 4 +- .../plugins/publish/collect_anatomy_object.py | 2 +- .../plugins/publish/collect_audio.py | 4 +- .../plugins/publish/collect_comment.py | 4 +- .../publish/collect_context_entities.py | 4 +- .../publish/collect_current_context.py | 2 +- .../publish/collect_current_pype_user.py | 4 +- .../publish/collect_custom_staging_dir.py | 2 +- .../plugins/publish/collect_datetime_data.py | 2 +- .../plugins/publish/collect_frames_fix.py | 6 +-- .../publish/collect_from_create_context.py | 8 ++-- .../plugins/publish/collect_host_name.py | 2 +- ...llect_input_representations_to_versions.py | 2 +- .../plugins/publish/collect_modules.py | 2 +- .../publish/collect_otio_frame_ranges.py | 2 +- .../publish/collect_otio_subset_resources.py | 4 +- .../plugins/publish/collect_rendered_files.py | 4 +- .../publish/collect_scene_loaded_versions.py | 4 +- .../plugins/publish/collect_scene_version.py | 6 +-- .../plugins/publish/collect_settings.py | 2 +- .../ayon_core/plugins/publish/collect_time.py | 2 +- .../plugins/publish/extract_burnin.py | 12 +++--- .../publish/extract_color_transcode.py | 8 ++-- .../publish/extract_colorspace_data.py | 2 +- .../publish/extract_hierarchy_avalon.py | 6 +-- .../publish/extract_hierarchy_to_ayon.py | 6 +-- .../publish/extract_otio_audio_tracks.py | 2 +- .../plugins/publish/extract_otio_file.py | 2 +- .../plugins/publish/extract_otio_review.py | 10 ++--- .../publish/extract_otio_trimming_video.py | 6 +-- .../plugins/publish/extract_review.py | 8 ++-- .../plugins/publish/extract_review_slate.py | 6 +-- .../plugins/publish/extract_scanline_exr.py | 4 +- .../plugins/publish/extract_thumbnail.py | 6 +-- .../publish/extract_thumbnail_from_source.py | 2 +- .../publish/extract_trim_video_audio.py | 4 +- client/ayon_core/plugins/publish/integrate.py | 10 ++--- .../plugins/publish/integrate_hero_version.py | 12 +++--- .../plugins/publish/integrate_inputlinks.py | 4 +- .../publish/integrate_inputlinks_ayon.py | 2 +- .../plugins/publish/integrate_subset_group.py | 4 +- .../plugins/publish/integrate_thumbnail.py | 8 ++-- .../publish/integrate_thumbnail_ayon.py | 8 ++-- .../publish/integrate_version_attrs.py | 4 +- .../preintegrate_thumbnail_representation.py | 2 +- .../plugins/publish/validate_asset_docs.py | 2 +- .../plugins/publish/validate_containers.py | 6 +-- .../publish/validate_editorial_asset_name.py | 2 +- .../plugins/publish/validate_file_saved.py | 2 +- .../plugins/publish/validate_filesequences.py | 2 +- .../plugins/publish/validate_intent.py | 4 +- .../plugins/publish/validate_publish_dir.py | 4 +- .../plugins/publish/validate_resources.py | 2 +- .../publish/validate_unique_subsets.py | 2 +- .../plugins/publish/validate_version.py | 2 +- client/ayon_core/pype_commands.py | 38 +++++++++---------- client/ayon_core/resources/__init__.py | 4 +- .../scripts/non_python_host_launch.py | 8 ++-- client/ayon_core/scripts/otio_burnin.py | 2 +- client/ayon_core/scripts/remote_publish.py | 4 +- client/ayon_core/settings/ayon_settings.py | 4 +- .../defaults/project_settings/maya.json | 2 +- .../defaults/project_settings/nuke.json | 4 +- .../settings/entities/base_entity.py | 2 +- .../settings/entities/dict_conditional.py | 2 +- .../entities/dict_immutable_keys_entity.py | 2 +- .../entities/dict_mutable_keys_entity.py | 2 +- .../ayon_core/settings/entities/exceptions.py | 2 +- .../settings/entities/input_entities.py | 2 +- client/ayon_core/settings/entities/lib.py | 6 +-- .../settings/entities/op_version_entity.py | 2 +- .../settings/entities/root_entities.py | 6 +-- client/ayon_core/settings/handlers.py | 18 ++++----- client/ayon_core/settings/lib.py | 10 ++--- client/ayon_core/style/__init__.py | 2 +- .../tests/test_avalon_plugin_presets.py | 2 +- .../tests/test_lib_restructuralization.py | 22 +++++------ client/ayon_core/tests/test_pyblish_filter.py | 2 +- client/ayon_core/tools/adobe_webserver/app.py | 2 +- client/ayon_core/tools/assetlinks/widgets.py | 2 +- .../tools/attribute_defs/files_widget.py | 8 ++-- .../ayon_core/tools/attribute_defs/widgets.py | 6 +-- .../ayon_core/tools/ayon_launcher/control.py | 8 ++-- .../tools/ayon_launcher/models/actions.py | 12 +++--- .../tools/ayon_launcher/ui/actions_widget.py | 4 +- .../tools/ayon_launcher/ui/hierarchy_page.py | 4 +- .../tools/ayon_launcher/ui/projects_widget.py | 8 ++-- .../tools/ayon_launcher/ui/window.py | 6 +-- .../ayon_core/tools/ayon_loader/abstract.py | 2 +- client/ayon_core/tools/ayon_loader/control.py | 8 ++-- .../tools/ayon_loader/models/actions.py | 8 ++-- .../tools/ayon_loader/models/products.py | 6 +-- .../tools/ayon_loader/models/site_sync.py | 12 +++--- .../tools/ayon_loader/ui/actions_utils.py | 8 ++-- .../tools/ayon_loader/ui/folders_widget.py | 8 ++-- .../tools/ayon_loader/ui/info_widget.py | 2 +- .../ayon_loader/ui/product_group_dialog.py | 2 +- .../ayon_loader/ui/product_types_widget.py | 2 +- .../ayon_loader/ui/products_delegates.py | 2 +- .../tools/ayon_loader/ui/products_model.py | 4 +- .../tools/ayon_loader/ui/products_widget.py | 4 +- .../tools/ayon_loader/ui/repres_widget.py | 6 +-- .../ayon_core/tools/ayon_loader/ui/window.py | 12 +++--- .../tools/ayon_push_to_project/control.py | 12 +++--- .../tools/ayon_push_to_project/main.py | 4 +- .../ayon_push_to_project/models/integrate.py | 22 +++++------ .../models/user_values.py | 2 +- .../tools/ayon_push_to_project/ui/window.py | 8 ++-- .../tools/ayon_sceneinventory/control.py | 8 ++-- .../tools/ayon_sceneinventory/model.py | 10 ++--- .../ayon_sceneinventory/models/site_sync.py | 4 +- .../switch_dialog/dialog.py | 4 +- .../switch_dialog/folders_input.py | 4 +- .../switch_dialog/widgets.py | 2 +- .../tools/ayon_sceneinventory/view.py | 8 ++-- .../tools/ayon_sceneinventory/window.py | 8 ++-- .../tools/ayon_utils/models/hierarchy.py | 2 +- .../tools/ayon_utils/models/projects.py | 2 +- .../tools/ayon_utils/models/thumbnails.py | 2 +- .../ayon_utils/widgets/folders_widget.py | 2 +- .../ayon_utils/widgets/projects_widget.py | 2 +- .../tools/ayon_utils/widgets/tasks_widget.py | 4 +- .../tools/ayon_utils/widgets/utils.py | 2 +- .../tools/ayon_workfiles/abstract.py | 2 +- .../ayon_core/tools/ayon_workfiles/control.py | 18 ++++----- .../tools/ayon_workfiles/models/workfiles.py | 12 +++--- .../widgets/files_widget_published.py | 6 +-- .../widgets/files_widget_workarea.py | 6 +-- .../ayon_workfiles/widgets/save_as_dialog.py | 2 +- .../tools/ayon_workfiles/widgets/window.py | 10 ++--- .../tools/context_dialog/__init__.py | 2 +- .../tools/context_dialog/_ayon_window.py | 10 ++--- .../tools/context_dialog/_openpype_window.py | 14 +++---- client/ayon_core/tools/creator/model.py | 2 +- client/ayon_core/tools/creator/widgets.py | 6 +-- client/ayon_core/tools/creator/window.py | 12 +++--- .../tools/experimental_tools/dialog.py | 4 +- .../tools/experimental_tools/tools_def.py | 4 +- client/ayon_core/tools/launcher/actions.py | 8 ++-- client/ayon_core/tools/launcher/lib.py | 2 +- client/ayon_core/tools/launcher/models.py | 16 ++++---- client/ayon_core/tools/launcher/widgets.py | 6 +-- client/ayon_core/tools/launcher/window.py | 8 ++-- client/ayon_core/tools/libraryloader/app.py | 14 +++---- client/ayon_core/tools/loader/app.py | 14 +++---- client/ayon_core/tools/loader/lib.py | 6 +-- client/ayon_core/tools/loader/model.py | 18 ++++----- client/ayon_core/tools/loader/widgets.py | 24 ++++++------ .../project_manager/project_manager/model.py | 6 +-- .../multiselection_combobox.py | 4 +- .../project_manager/project_manager/style.py | 2 +- .../project_manager/project_manager/view.py | 4 +- .../project_manager/widgets.py | 12 +++--- .../project_manager/project_manager/window.py | 12 +++--- client/ayon_core/tools/publisher/control.py | 16 ++++---- .../ayon_core/tools/publisher/control_qt.py | 4 +- .../publisher/publish_report_viewer/model.py | 2 +- .../publish_report_viewer/widgets.py | 4 +- .../publisher/publish_report_viewer/window.py | 10 ++--- .../tools/publisher/widgets/assets_widget.py | 6 +-- .../publisher/widgets/border_label_widget.py | 2 +- .../publisher/widgets/card_view_widgets.py | 6 +-- .../tools/publisher/widgets/create_widget.py | 4 +- .../publisher/widgets/list_view_widgets.py | 6 +-- .../publisher/widgets/overview_widget.py | 2 +- .../publisher/widgets/precreate_widget.py | 2 +- .../tools/publisher/widgets/report_page.py | 4 +- .../tools/publisher/widgets/tabs_widget.py | 2 +- .../tools/publisher/widgets/tasks_widget.py | 4 +- .../publisher/widgets/thumbnail_widget.py | 10 ++--- .../tools/publisher/widgets/widgets.py | 16 ++++---- client/ayon_core/tools/publisher/window.py | 8 ++-- client/ayon_core/tools/push_to_project/app.py | 4 +- .../tools/push_to_project/control_context.py | 10 ++--- .../push_to_project/control_integrate.py | 22 +++++------ .../ayon_core/tools/push_to_project/window.py | 6 +-- .../ayon_core/tools/pyblish_pype/control.py | 2 +- client/ayon_core/tools/pyblish_pype/model.py | 2 +- .../ayon_core/tools/sceneinventory/model.py | 12 +++--- .../tools/sceneinventory/switch_dialog.py | 6 +-- client/ayon_core/tools/sceneinventory/view.py | 10 ++--- .../ayon_core/tools/sceneinventory/widgets.py | 2 +- .../ayon_core/tools/sceneinventory/window.py | 10 ++--- client/ayon_core/tools/settings/__init__.py | 4 +- .../settings/local_settings/apps_widget.py | 4 +- .../local_settings/environments_widget.py | 2 +- .../local_settings/experimental_widget.py | 2 +- .../settings/local_settings/general_widget.py | 6 +-- .../settings/local_settings/mongo_widget.py | 4 +- .../local_settings/projects_widget.py | 6 +-- .../tools/settings/local_settings/widgets.py | 2 +- .../tools/settings/local_settings/window.py | 14 +++---- .../ayon_core/tools/settings/settings/base.py | 4 +- .../tools/settings/settings/categories.py | 12 +++--- .../tools/settings/settings/color_widget.py | 2 +- .../tools/settings/settings/dialogs.py | 2 +- .../settings/settings/dict_conditional.py | 2 +- .../settings/settings/dict_mutable_widget.py | 4 +- .../tools/settings/settings/item_widgets.py | 8 ++-- .../settings/settings/list_item_widget.py | 2 +- .../tools/settings/settings/widgets.py | 16 ++++---- .../tools/settings/settings/window.py | 10 ++--- .../settings/settings/wrapper_widgets.py | 2 +- .../ayon_core/tools/standalonepublish/app.py | 10 ++--- .../tools/standalonepublish/publish.py | 4 +- .../standalonepublish/widgets/model_asset.py | 4 +- .../widgets/model_tasks_template.py | 2 +- .../standalonepublish/widgets/widget_asset.py | 8 ++-- .../widgets/widget_components.py | 4 +- .../widgets/widget_drop_frame.py | 4 +- .../widgets/widget_family.py | 10 ++--- client/ayon_core/tools/stdout_broker/app.py | 2 +- .../ayon_core/tools/stdout_broker/window.py | 2 +- client/ayon_core/tools/subsetmanager/model.py | 2 +- .../ayon_core/tools/subsetmanager/window.py | 10 ++--- client/ayon_core/tools/texture_copy/app.py | 6 +-- .../ayon_core/tools/tray/pype_info_widget.py | 14 +++---- client/ayon_core/tools/tray/pype_tray.py | 18 ++++----- .../ayon_core/tools/traypublisher/window.py | 16 ++++---- client/ayon_core/tools/utils/assets_widget.py | 8 ++-- client/ayon_core/tools/utils/delegates.py | 4 +- client/ayon_core/tools/utils/host_tools.py | 32 ++++++++-------- client/ayon_core/tools/utils/lib.py | 14 +++---- client/ayon_core/tools/utils/models.py | 2 +- .../ayon_core/tools/utils/overlay_messages.py | 2 +- client/ayon_core/tools/utils/tasks_widget.py | 6 +-- .../tools/utils/thumbnail_paint_widget.py | 2 +- client/ayon_core/tools/utils/views.py | 4 +- client/ayon_core/tools/utils/widgets.py | 4 +- .../tools/workfile_template_build/window.py | 8 ++-- client/ayon_core/tools/workfiles/app.py | 6 +-- .../ayon_core/tools/workfiles/files_widget.py | 20 +++++----- .../ayon_core/tools/workfiles/lock_dialog.py | 4 +- client/ayon_core/tools/workfiles/model.py | 6 +-- .../tools/workfiles/save_as_dialog.py | 10 ++--- client/ayon_core/tools/workfiles/window.py | 16 ++++---- client/ayon_core/widgets/README.md | 4 +- client/ayon_core/widgets/nice_checkbox.py | 2 +- client/ayon_core/widgets/password_dialog.py | 8 ++-- 1247 files changed, 3341 insertions(+), 3343 deletions(-) diff --git a/client/ayon_core/__init__.py b/client/ayon_core/__init__.py index e6b77b1853..c9c0dfc614 100644 --- a/client/ayon_core/__init__.py +++ b/client/ayon_core/__init__.py @@ -1,7 +1,9 @@ import os -PACKAGE_DIR = os.path.dirname(os.path.abspath(__file__)) -PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins") +AYON_CORE_ROOT = os.path.dirname(os.path.abspath(__file__)) -AYON_SERVER_ENABLED = os.environ.get("USE_AYON_SERVER") == "1" +# TODO remove after '1.x.x' +PACKAGE_DIR = AYON_CORE_ROOT +PLUGINS_DIR = os.path.join(AYON_CORE_ROOT, "plugins") +AYON_SERVER_ENABLED = True diff --git a/client/ayon_core/cli.py b/client/ayon_core/cli.py index 8caa139765..b0c17633ab 100644 --- a/client/ayon_core/cli.py +++ b/client/ayon_core/cli.py @@ -5,7 +5,7 @@ import sys import code import click -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED from .pype_commands import PypeCommands @@ -205,7 +205,7 @@ def projectmanager(): @main.command(context_settings={"ignore_unknown_options": True}) def publish_report_viewer(): - from openpype.tools.publisher.publish_report_viewer import main + from ayon_core.tools.publisher.publish_report_viewer import main sys.exit(main()) @@ -335,7 +335,7 @@ def syncserver(ctx, active_site): if AYON_SERVER_ENABLED: raise RuntimeError("AYON does not support 'syncserver' command.") - from openpype.modules.sync_server.sync_server_module import ( + from ayon_core.modules.sync_server.sync_server_module import ( syncservice) ctx.invoke(syncservice, active_site=active_site) @@ -399,7 +399,7 @@ def interactive(): f"AYON launcher {version}\nPython {sys.version} on {sys.platform}" ) else: - from openpype.version import __version__ + from ayon_core.version import __version__ banner = ( f"OpenPype {__version__}\nPython {sys.version} on {sys.platform}" @@ -416,7 +416,7 @@ def version(build): print(os.environ["AYON_VERSION"]) return - from openpype.version import __version__ + from ayon_core.version import __version__ from igniter.bootstrap_repos import BootstrapRepos, OpenPypeVersion from pathlib import Path diff --git a/client/ayon_core/client/entities.py b/client/ayon_core/client/entities.py index cbaa943743..cd3b407ebb 100644 --- a/client/ayon_core/client/entities.py +++ b/client/ayon_core/client/entities.py @@ -1,4 +1,4 @@ -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED if not AYON_SERVER_ENABLED: from .mongo.entities import * diff --git a/client/ayon_core/client/entity_links.py b/client/ayon_core/client/entity_links.py index e18970de90..a356c04803 100644 --- a/client/ayon_core/client/entity_links.py +++ b/client/ayon_core/client/entity_links.py @@ -1,4 +1,4 @@ -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED if not AYON_SERVER_ENABLED: from .mongo.entity_links import * diff --git a/client/ayon_core/client/mongo/mongo.py b/client/ayon_core/client/mongo/mongo.py index 2be426efeb..5e2d4fcd9c 100644 --- a/client/ayon_core/client/mongo/mongo.py +++ b/client/ayon_core/client/mongo/mongo.py @@ -11,7 +11,7 @@ from bson.json_util import ( CANONICAL_JSON_OPTIONS ) -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED if sys.version_info[0] == 2: from urlparse import urlparse, parse_qs else: diff --git a/client/ayon_core/client/mongo/operations.py b/client/ayon_core/client/mongo/operations.py index 3537aa4a3d..859150c519 100644 --- a/client/ayon_core/client/mongo/operations.py +++ b/client/ayon_core/client/mongo/operations.py @@ -5,7 +5,7 @@ import collections from bson.objectid import ObjectId from pymongo import DeleteOne, InsertOne, UpdateOne -from openpype.client.operations_base import ( +from ayon_core.client.operations_base import ( REMOVED_VALUE, CreateOperation, UpdateOperation, @@ -572,8 +572,8 @@ def create_project( dict: Created project document. """ - from openpype.settings import ProjectSettings, SaveWarningExc - from openpype.pipeline.schema import validate + from ayon_core.settings import ProjectSettings, SaveWarningExc + from ayon_core.pipeline.schema import validate if get_project(project_name, fields=["name"]): raise ValueError("Project with name \"{}\" already exists".format( diff --git a/client/ayon_core/client/operations.py b/client/ayon_core/client/operations.py index 8bc09dffd3..b845fb9ed4 100644 --- a/client/ayon_core/client/operations.py +++ b/client/ayon_core/client/operations.py @@ -1,4 +1,4 @@ -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED from .operations_base import REMOVED_VALUE if not AYON_SERVER_ENABLED: diff --git a/client/ayon_core/client/server/conversion_utils.py b/client/ayon_core/client/server/conversion_utils.py index e8d3c4cbe4..f710151f0f 100644 --- a/client/ayon_core/client/server/conversion_utils.py +++ b/client/ayon_core/client/server/conversion_utils.py @@ -5,8 +5,8 @@ import json import six -from openpype.client.operations_base import REMOVED_VALUE -from openpype.client.mongo.operations import ( +from ayon_core.client.operations_base import REMOVED_VALUE +from ayon_core.client.mongo.operations import ( CURRENT_PROJECT_SCHEMA, CURRENT_ASSET_DOC_SCHEMA, CURRENT_SUBSET_SCHEMA, diff --git a/client/ayon_core/client/server/entities.py b/client/ayon_core/client/server/entities.py index 75b5dc2cdd..cce3242e63 100644 --- a/client/ayon_core/client/server/entities.py +++ b/client/ayon_core/client/server/entities.py @@ -1,6 +1,6 @@ import collections -from openpype.client.mongo.operations import CURRENT_THUMBNAIL_SCHEMA +from ayon_core.client.mongo.operations import CURRENT_THUMBNAIL_SCHEMA from .utils import get_ayon_server_api_connection from .openpype_comp import get_folders_with_tasks diff --git a/client/ayon_core/client/server/operations.py b/client/ayon_core/client/server/operations.py index eddc1eaf60..653eb0cb3e 100644 --- a/client/ayon_core/client/server/operations.py +++ b/client/ayon_core/client/server/operations.py @@ -6,7 +6,7 @@ import datetime from bson.objectid import ObjectId -from openpype.client.operations_base import ( +from ayon_core.client.operations_base import ( REMOVED_VALUE, CreateOperation, UpdateOperation, @@ -14,7 +14,7 @@ from openpype.client.operations_base import ( BaseOperationsSession ) -from openpype.client.mongo.operations import ( +from ayon_core.client.mongo.operations import ( CURRENT_THUMBNAIL_SCHEMA, CURRENT_REPRESENTATION_SCHEMA, CURRENT_HERO_VERSION_SCHEMA, diff --git a/client/ayon_core/client/server/utils.py b/client/ayon_core/client/server/utils.py index a9dcf539bd..26da6e34e1 100644 --- a/client/ayon_core/client/server/utils.py +++ b/client/ayon_core/client/server/utils.py @@ -3,7 +3,7 @@ import uuid import ayon_api -from openpype.client.operations_base import REMOVED_VALUE +from ayon_core.client.operations_base import REMOVED_VALUE class _GlobalCache: @@ -14,7 +14,7 @@ def get_ayon_server_api_connection(): if _GlobalCache.initialized: con = ayon_api.get_server_api_connection() else: - from openpype.lib.local_settings import get_local_site_id + from ayon_core.lib.local_settings import get_local_site_id _GlobalCache.initialized = True site_id = get_local_site_id() diff --git a/client/ayon_core/hooks/pre_add_last_workfile_arg.py b/client/ayon_core/hooks/pre_add_last_workfile_arg.py index 6e255ae82a..8144afd401 100644 --- a/client/ayon_core/hooks/pre_add_last_workfile_arg.py +++ b/client/ayon_core/hooks/pre_add_last_workfile_arg.py @@ -1,6 +1,6 @@ import os -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class AddLastWorkfileToLaunchArgs(PreLaunchHook): diff --git a/client/ayon_core/hooks/pre_copy_template_workfile.py b/client/ayon_core/hooks/pre_copy_template_workfile.py index 4d91d83c95..e5d2d4f640 100644 --- a/client/ayon_core/hooks/pre_copy_template_workfile.py +++ b/client/ayon_core/hooks/pre_copy_template_workfile.py @@ -1,8 +1,8 @@ import os import shutil -from openpype.settings import get_project_settings -from openpype.lib.applications import PreLaunchHook, LaunchTypes -from openpype.pipeline.workfile import ( +from ayon_core.settings import get_project_settings +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.pipeline.workfile import ( get_custom_workfile_template, get_custom_workfile_template_by_string_context ) diff --git a/client/ayon_core/hooks/pre_create_extra_workdir_folders.py b/client/ayon_core/hooks/pre_create_extra_workdir_folders.py index 4c9d08b375..6116d5fbd3 100644 --- a/client/ayon_core/hooks/pre_create_extra_workdir_folders.py +++ b/client/ayon_core/hooks/pre_create_extra_workdir_folders.py @@ -1,6 +1,6 @@ import os -from openpype.lib.applications import PreLaunchHook, LaunchTypes -from openpype.pipeline.workfile import create_workdir_extra_folders +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.pipeline.workfile import create_workdir_extra_folders class CreateWorkdirExtraFolders(PreLaunchHook): diff --git a/client/ayon_core/hooks/pre_global_host_data.py b/client/ayon_core/hooks/pre_global_host_data.py index 813df24af0..3422c87484 100644 --- a/client/ayon_core/hooks/pre_global_host_data.py +++ b/client/ayon_core/hooks/pre_global_host_data.py @@ -1,11 +1,11 @@ -from openpype.client import get_project, get_asset_by_name -from openpype.lib.applications import ( +from ayon_core.client import get_project, get_asset_by_name +from ayon_core.lib.applications import ( PreLaunchHook, EnvironmentPrepData, prepare_app_environments, prepare_context_environments ) -from openpype.pipeline import Anatomy +from ayon_core.pipeline import Anatomy class GlobalHostDataHook(PreLaunchHook): diff --git a/client/ayon_core/hooks/pre_mac_launch.py b/client/ayon_core/hooks/pre_mac_launch.py index 402e9a5517..95e06fba17 100644 --- a/client/ayon_core/hooks/pre_mac_launch.py +++ b/client/ayon_core/hooks/pre_mac_launch.py @@ -1,5 +1,5 @@ import os -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class LaunchWithTerminal(PreLaunchHook): diff --git a/client/ayon_core/hooks/pre_new_console_apps.py b/client/ayon_core/hooks/pre_new_console_apps.py index 9727b4fb78..c81b924573 100644 --- a/client/ayon_core/hooks/pre_new_console_apps.py +++ b/client/ayon_core/hooks/pre_new_console_apps.py @@ -1,5 +1,5 @@ import subprocess -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class LaunchNewConsoleApps(PreLaunchHook): diff --git a/client/ayon_core/hooks/pre_non_python_host_launch.py b/client/ayon_core/hooks/pre_non_python_host_launch.py index d9e912c826..4fb1349d82 100644 --- a/client/ayon_core/hooks/pre_non_python_host_launch.py +++ b/client/ayon_core/hooks/pre_non_python_host_launch.py @@ -1,13 +1,13 @@ import os -from openpype.lib import get_openpype_execute_args -from openpype.lib.applications import ( +from ayon_core.lib import get_openpype_execute_args +from ayon_core.lib.applications import ( get_non_python_host_kwargs, PreLaunchHook, LaunchTypes, ) -from openpype import PACKAGE_DIR as OPENPYPE_DIR +from ayon_core import AYON_CORE_ROOT class NonPythonHostHook(PreLaunchHook): @@ -32,7 +32,7 @@ class NonPythonHostHook(PreLaunchHook): remainders.append(self.launch_context.launch_args.pop(0)) script_path = os.path.join( - OPENPYPE_DIR, + AYON_CORE_ROOT, "scripts", "non_python_host_launch.py" ) diff --git a/client/ayon_core/hooks/pre_ocio_hook.py b/client/ayon_core/hooks/pre_ocio_hook.py index e695cf3fe8..00ba9a3bcb 100644 --- a/client/ayon_core/hooks/pre_ocio_hook.py +++ b/client/ayon_core/hooks/pre_ocio_hook.py @@ -1,7 +1,7 @@ -from openpype.lib.applications import PreLaunchHook +from ayon_core.lib.applications import PreLaunchHook -from openpype.pipeline.colorspace import get_imageio_config -from openpype.pipeline.template_data import get_template_data_with_names +from ayon_core.pipeline.colorspace import get_imageio_config +from ayon_core.pipeline.template_data import get_template_data_with_names class OCIOEnvHook(PreLaunchHook): diff --git a/client/ayon_core/host/dirmap.py b/client/ayon_core/host/dirmap.py index 96a98e808e..1f8fddadcf 100644 --- a/client/ayon_core/host/dirmap.py +++ b/client/ayon_core/host/dirmap.py @@ -12,10 +12,10 @@ import platform import six -from openpype.lib import Logger -from openpype.modules import ModulesManager -from openpype.settings import get_project_settings -from openpype.settings.lib import get_site_local_overrides +from ayon_core.lib import Logger +from ayon_core.modules import ModulesManager +from ayon_core.settings import get_project_settings +from ayon_core.settings.lib import get_site_local_overrides @six.add_metaclass(ABCMeta) diff --git a/client/ayon_core/host/host.py b/client/ayon_core/host/host.py index afe06d1f55..4bf7ed1fbd 100644 --- a/client/ayon_core/host/host.py +++ b/client/ayon_core/host/host.py @@ -31,16 +31,16 @@ class HostBase(object): # Installation of host before (avalon concept): ```python - from openpype.pipeline import install_host - import openpype.hosts.maya.api as host + from ayon_core.pipeline import install_host + import ayon_core.hosts.maya.api as host install_host(host) ``` # Installation of host now: ```python - from openpype.pipeline import install_host - from openpype.hosts.maya.api import MayaHost + from ayon_core.pipeline import install_host + from ayon_core.hosts.maya.api import MayaHost host = MayaHost() install_host(host) diff --git a/client/ayon_core/hosts/aftereffects/addon.py b/client/ayon_core/hosts/aftereffects/addon.py index 79df550312..2a5da8b3a8 100644 --- a/client/ayon_core/hosts/aftereffects/addon.py +++ b/client/ayon_core/hosts/aftereffects/addon.py @@ -1,4 +1,4 @@ -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon class AfterEffectsAddon(OpenPypeModule, IHostAddon): diff --git a/client/ayon_core/hosts/aftereffects/api/README.md b/client/ayon_core/hosts/aftereffects/api/README.md index 9c4bad3689..1708fc0c3f 100644 --- a/client/ayon_core/hosts/aftereffects/api/README.md +++ b/client/ayon_core/hosts/aftereffects/api/README.md @@ -25,7 +25,7 @@ download [Anastasiy’s Extension Manager](https://install.anastasiy.com/) The easiest way to get the server and After Effects launch is with: ``` -python -c ^"import openpype.hosts.photoshop;openpype.hosts..aftereffects.launch(""c:\Program Files\Adobe\Adobe After Effects 2020\Support Files\AfterFX.exe"")^" +python -c ^"import ayon_core.hosts.photoshop;openpype.hosts..aftereffects.launch(""c:\Program Files\Adobe\Adobe After Effects 2020\Support Files\AfterFX.exe"")^" ``` `avalon.aftereffects.launch` launches the application and server, and also closes the server when After Effects exists. diff --git a/client/ayon_core/hosts/aftereffects/api/launch_logic.py b/client/ayon_core/hosts/aftereffects/api/launch_logic.py index e90c3dc5b8..1560daf162 100644 --- a/client/ayon_core/hosts/aftereffects/api/launch_logic.py +++ b/client/ayon_core/hosts/aftereffects/api/launch_logic.py @@ -15,12 +15,12 @@ from wsrpc_aiohttp import ( from qtpy import QtCore -from openpype.lib import Logger -from openpype.tests.lib import is_in_tests -from openpype.pipeline import install_host, legacy_io -from openpype.modules import ModulesManager -from openpype.tools.utils import host_tools, get_openpype_qt_app -from openpype.tools.adobe_webserver.app import WebServerTool +from ayon_core.lib import Logger +from ayon_core.tests.lib import is_in_tests +from ayon_core.pipeline import install_host, legacy_io +from ayon_core.modules import ModulesManager +from ayon_core.tools.utils import host_tools, get_openpype_qt_app +from ayon_core.tools.adobe_webserver.app import WebServerTool from .ws_stub import get_stub from .lib import set_settings @@ -37,7 +37,7 @@ def main(*subprocess_args): """Main entrypoint to AE launching, called from pre hook.""" sys.excepthook = safe_excepthook - from openpype.hosts.aftereffects.api import AfterEffectsHost + from ayon_core.hosts.aftereffects.api import AfterEffectsHost host = AfterEffectsHost() install_host(host) @@ -359,7 +359,7 @@ class AfterEffectsRoute(WebSocketRoute): return "nothing" def create_placeholder_route(self): - from openpype.hosts.aftereffects.api.workfile_template_builder import \ + from ayon_core.hosts.aftereffects.api.workfile_template_builder import \ create_placeholder partial_method = functools.partial(create_placeholder) @@ -369,7 +369,7 @@ class AfterEffectsRoute(WebSocketRoute): return "nothing" def update_placeholder_route(self): - from openpype.hosts.aftereffects.api.workfile_template_builder import \ + from ayon_core.hosts.aftereffects.api.workfile_template_builder import \ update_placeholder partial_method = functools.partial(update_placeholder) @@ -379,7 +379,7 @@ class AfterEffectsRoute(WebSocketRoute): return "nothing" def build_workfile_template_route(self): - from openpype.hosts.aftereffects.api.workfile_template_builder import \ + from ayon_core.hosts.aftereffects.api.workfile_template_builder import \ build_workfile_template partial_method = functools.partial(build_workfile_template) diff --git a/client/ayon_core/hosts/aftereffects/api/lib.py b/client/ayon_core/hosts/aftereffects/api/lib.py index e8352c382b..f5f2d98698 100644 --- a/client/ayon_core/hosts/aftereffects/api/lib.py +++ b/client/ayon_core/hosts/aftereffects/api/lib.py @@ -4,8 +4,8 @@ import json import contextlib import logging -from openpype.pipeline.context_tools import get_current_context -from openpype.client import get_asset_by_name +from ayon_core.pipeline.context_tools import get_current_context +from ayon_core.client import get_asset_by_name from .ws_stub import get_stub log = logging.getLogger(__name__) diff --git a/client/ayon_core/hosts/aftereffects/api/pipeline.py b/client/ayon_core/hosts/aftereffects/api/pipeline.py index e059f7c272..d875f811de 100644 --- a/client/ayon_core/hosts/aftereffects/api/pipeline.py +++ b/client/ayon_core/hosts/aftereffects/api/pipeline.py @@ -4,26 +4,26 @@ from qtpy import QtWidgets import pyblish.api -from openpype.lib import Logger, register_event_callback -from openpype.pipeline import ( +from ayon_core.lib import Logger, register_event_callback +from ayon_core.pipeline import ( register_loader_plugin_path, register_creator_plugin_path, AVALON_CONTAINER_ID, ) -from openpype.hosts.aftereffects.api.workfile_template_builder import ( +from ayon_core.hosts.aftereffects.api.workfile_template_builder import ( AEPlaceholderLoadPlugin, AEPlaceholderCreatePlugin ) -from openpype.pipeline.load import any_outdated_containers -import openpype.hosts.aftereffects +from ayon_core.pipeline.load import any_outdated_containers +import ayon_core.hosts.aftereffects -from openpype.host import ( +from ayon_core.host import ( HostBase, IWorkfileHost, ILoadHost, IPublishHost ) -from openpype.tools.utils import get_openpype_qt_app +from ayon_core.tools.utils import get_openpype_qt_app from .launch_logic import get_stub from .ws_stub import ConnectionNotEstablishedYet diff --git a/client/ayon_core/hosts/aftereffects/api/plugin.py b/client/ayon_core/hosts/aftereffects/api/plugin.py index aa940c0c98..0ddb244645 100644 --- a/client/ayon_core/hosts/aftereffects/api/plugin.py +++ b/client/ayon_core/hosts/aftereffects/api/plugin.py @@ -1,7 +1,7 @@ import six from abc import ABCMeta -from openpype.pipeline import LoaderPlugin +from ayon_core.pipeline import LoaderPlugin from .launch_logic import get_stub diff --git a/client/ayon_core/hosts/aftereffects/api/workfile_template_builder.py b/client/ayon_core/hosts/aftereffects/api/workfile_template_builder.py index 5a97afcef1..aa2f36e8aa 100644 --- a/client/ayon_core/hosts/aftereffects/api/workfile_template_builder.py +++ b/client/ayon_core/hosts/aftereffects/api/workfile_template_builder.py @@ -2,11 +2,11 @@ import os.path import uuid import shutil -from openpype.pipeline import registered_host -from openpype.tools.workfile_template_build import ( +from ayon_core.pipeline import registered_host +from ayon_core.tools.workfile_template_build import ( WorkfileBuildPlaceholderDialog, ) -from openpype.pipeline.workfile.workfile_template_builder import ( +from ayon_core.pipeline.workfile.workfile_template_builder import ( AbstractTemplateBuilder, PlaceholderPlugin, LoadPlaceholderItem, @@ -14,8 +14,8 @@ from openpype.pipeline.workfile.workfile_template_builder import ( PlaceholderLoadMixin, PlaceholderCreateMixin ) -from openpype.hosts.aftereffects.api import get_stub -from openpype.hosts.aftereffects.api.lib import set_settings +from ayon_core.hosts.aftereffects.api import get_stub +from ayon_core.hosts.aftereffects.api.lib import set_settings PLACEHOLDER_SET = "PLACEHOLDERS_SET" PLACEHOLDER_ID = "openpype.placeholder" diff --git a/client/ayon_core/hosts/aftereffects/api/ws_stub.py b/client/ayon_core/hosts/aftereffects/api/ws_stub.py index 18f530e272..869acc3405 100644 --- a/client/ayon_core/hosts/aftereffects/api/ws_stub.py +++ b/client/ayon_core/hosts/aftereffects/api/ws_stub.py @@ -8,7 +8,7 @@ import logging import attr from wsrpc_aiohttp import WebSocketAsync -from openpype.tools.adobe_webserver.app import WebServerTool +from ayon_core.tools.adobe_webserver.app import WebServerTool class ConnectionNotEstablishedYet(Exception): diff --git a/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py b/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py index fadfc0c206..99c8ed81d3 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py +++ b/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py @@ -1,17 +1,17 @@ import re -from openpype import resources -from openpype.lib import BoolDef, UISeparatorDef -from openpype.hosts.aftereffects import api -from openpype.pipeline import ( +from ayon_core import resources +from ayon_core.lib import BoolDef, UISeparatorDef +from ayon_core.hosts.aftereffects import api +from ayon_core.pipeline import ( Creator, CreatedInstance, CreatorError ) -from openpype.hosts.aftereffects.api.pipeline import cache_and_get_instances -from openpype.hosts.aftereffects.api.lib import set_settings -from openpype.lib import prepare_template_data -from openpype.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS +from ayon_core.hosts.aftereffects.api.pipeline import cache_and_get_instances +from ayon_core.hosts.aftereffects.api.lib import set_settings +from ayon_core.lib import prepare_template_data +from ayon_core.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS class RenderCreator(Creator): diff --git a/client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py b/client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py index 5dc3d6592d..8abb560940 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py +++ b/client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py @@ -1,11 +1,11 @@ -from openpype import AYON_SERVER_ENABLED -import openpype.hosts.aftereffects.api as api -from openpype.client import get_asset_by_name -from openpype.pipeline import ( +from ayon_core import AYON_SERVER_ENABLED +import ayon_core.hosts.aftereffects.api as api +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline import ( AutoCreator, CreatedInstance ) -from openpype.hosts.aftereffects.api.pipeline import cache_and_get_instances +from ayon_core.hosts.aftereffects.api.pipeline import cache_and_get_instances class AEWorkfileCreator(AutoCreator): diff --git a/client/ayon_core/hosts/aftereffects/plugins/load/load_background.py b/client/ayon_core/hosts/aftereffects/plugins/load/load_background.py index 16f45074aa..f23d7ec0bd 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/load/load_background.py +++ b/client/ayon_core/hosts/aftereffects/plugins/load/load_background.py @@ -1,9 +1,9 @@ import re -from openpype.pipeline import get_representation_path -from openpype.hosts.aftereffects import api +from ayon_core.pipeline import get_representation_path +from ayon_core.hosts.aftereffects import api -from openpype.hosts.aftereffects.api.lib import ( +from ayon_core.hosts.aftereffects.api.lib import ( get_background_layers, get_unique_layer_name, ) diff --git a/client/ayon_core/hosts/aftereffects/plugins/load/load_file.py b/client/ayon_core/hosts/aftereffects/plugins/load/load_file.py index 8d52aac546..a8e67e9f88 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/load/load_file.py +++ b/client/ayon_core/hosts/aftereffects/plugins/load/load_file.py @@ -1,8 +1,8 @@ import re -from openpype.pipeline import get_representation_path -from openpype.hosts.aftereffects import api -from openpype.hosts.aftereffects.api.lib import get_unique_layer_name +from ayon_core.pipeline import get_representation_path +from ayon_core.hosts.aftereffects import api +from ayon_core.hosts.aftereffects.api.lib import get_unique_layer_name class FileLoader(api.AfterEffectsLoader): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/add_publish_highlight.py b/client/ayon_core/hosts/aftereffects/plugins/publish/add_publish_highlight.py index d437a6754b..331d5281ed 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/add_publish_highlight.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/add_publish_highlight.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.hosts.aftereffects.api import get_stub +from ayon_core.hosts.aftereffects.api import get_stub class AddPublishHighlight(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/closeAE.py b/client/ayon_core/hosts/aftereffects/plugins/publish/closeAE.py index 0be20d9f05..c00591729e 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/closeAE.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/closeAE.py @@ -2,7 +2,7 @@ """Close AE after publish. For Webpublishing only.""" import pyblish.api -from openpype.hosts.aftereffects.api import get_stub +from ayon_core.hosts.aftereffects.api import get_stub class CloseAE(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_audio.py b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_audio.py index 8647ba498b..c0ef0b71a4 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_audio.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_audio.py @@ -2,7 +2,7 @@ import os import pyblish.api -from openpype.hosts.aftereffects.api import get_stub +from ayon_core.hosts.aftereffects.api import get_stub class CollectAudio(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_current_file.py b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_current_file.py index a6a6260a6b..aead872461 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_current_file.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_current_file.py @@ -2,7 +2,7 @@ import os import pyblish.api -from openpype.hosts.aftereffects.api import get_stub +from ayon_core.hosts.aftereffects.api import get_stub class CollectCurrentFile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_extension_version.py b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_extension_version.py index ef9a81b7fd..5b8393a49a 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_extension_version.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_extension_version.py @@ -2,7 +2,7 @@ import os import re import pyblish.api -from openpype.hosts.aftereffects.api import ( +from ayon_core.hosts.aftereffects.api import ( get_stub, get_extension_manifest_path ) diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py index 49874d6cff..a8a316ea80 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py @@ -5,11 +5,11 @@ import attr import pyblish.api -from openpype.settings import get_project_settings -from openpype.pipeline import publish -from openpype.pipeline.publish import RenderInstance +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import publish +from ayon_core.pipeline.publish import RenderInstance -from openpype.hosts.aftereffects.api import get_stub +from ayon_core.hosts.aftereffects.api import get_stub @attr.s diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py index 58d2757840..538d646ab4 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py @@ -2,8 +2,8 @@ import os import pyblish.api -from openpype.client import get_asset_name_identifier -from openpype.pipeline.create import get_subset_name +from ayon_core.client import get_asset_name_identifier +from ayon_core.pipeline.create import get_subset_name class CollectWorkfile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/extract_local_render.py b/client/ayon_core/hosts/aftereffects/plugins/publish/extract_local_render.py index b44e986d83..c5e62a2f54 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/extract_local_render.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/extract_local_render.py @@ -1,7 +1,7 @@ import os -from openpype.pipeline import publish -from openpype.hosts.aftereffects.api import get_stub +from ayon_core.pipeline import publish +from ayon_core.hosts.aftereffects.api import get_stub class ExtractLocalRender(publish.Extractor): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/extract_save_scene.py b/client/ayon_core/hosts/aftereffects/plugins/publish/extract_save_scene.py index 343838eb49..f0007f96d9 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/extract_save_scene.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/extract_save_scene.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.aftereffects.api import get_stub +from ayon_core.pipeline import publish +from ayon_core.hosts.aftereffects.api import get_stub class ExtractSaveScene(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/increment_workfile.py b/client/ayon_core/hosts/aftereffects/plugins/publish/increment_workfile.py index d8f6ef5d27..fc51ff9176 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/increment_workfile.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/increment_workfile.py @@ -1,8 +1,8 @@ import pyblish.api -from openpype.lib import version_up -from openpype.pipeline.publish import get_errored_plugins_from_context +from ayon_core.lib import version_up +from ayon_core.pipeline.publish import get_errored_plugins_from_context -from openpype.hosts.aftereffects.api import get_stub +from ayon_core.hosts.aftereffects.api import get_stub class IncrementWorkfile(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/pre_collect_render.py b/client/ayon_core/hosts/aftereffects/plugins/publish/pre_collect_render.py index 85a42830a4..de3c935dff 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/pre_collect_render.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/pre_collect_render.py @@ -1,6 +1,6 @@ import json import pyblish.api -from openpype.hosts.aftereffects.api import AfterEffectsHost +from ayon_core.hosts.aftereffects.api import AfterEffectsHost class PreCollectRender(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/remove_publish_highlight.py b/client/ayon_core/hosts/aftereffects/plugins/publish/remove_publish_highlight.py index 370f916f04..70b6efecb0 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/remove_publish_highlight.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/remove_publish_highlight.py @@ -1,5 +1,5 @@ -from openpype.pipeline import publish -from openpype.hosts.aftereffects.api import get_stub +from ayon_core.pipeline import publish +from ayon_core.hosts.aftereffects.api import get_stub class RemovePublishHighlight(publish.Extractor): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/validate_footage_items.py b/client/ayon_core/hosts/aftereffects/plugins/publish/validate_footage_items.py index 40a08a2c3f..ae20102417 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/validate_footage_items.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/validate_footage_items.py @@ -6,10 +6,10 @@ import os import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishXmlValidationError ) -from openpype.hosts.aftereffects.api import get_stub +from ayon_core.hosts.aftereffects.api import get_stub class ValidateFootageItems(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/validate_instance_asset.py b/client/ayon_core/hosts/aftereffects/plugins/publish/validate_instance_asset.py index 36f6035d23..c3938ecbda 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/validate_instance_asset.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/validate_instance_asset.py @@ -1,11 +1,11 @@ import pyblish.api -from openpype.pipeline import get_current_asset_name -from openpype.pipeline.publish import ( +from ayon_core.pipeline import get_current_asset_name +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) -from openpype.hosts.aftereffects.api import get_stub +from ayon_core.hosts.aftereffects.api import get_stub class ValidateInstanceAssetRepair(pyblish.api.Action): diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/validate_scene_settings.py b/client/ayon_core/hosts/aftereffects/plugins/publish/validate_scene_settings.py index 78f98d7445..0a90ae2a5a 100644 --- a/client/ayon_core/hosts/aftereffects/plugins/publish/validate_scene_settings.py +++ b/client/ayon_core/hosts/aftereffects/plugins/publish/validate_scene_settings.py @@ -9,11 +9,11 @@ import re import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishXmlValidationError, OptionalPyblishPluginMixin ) -from openpype.hosts.aftereffects.api import get_asset_settings +from ayon_core.hosts.aftereffects.api import get_asset_settings class ValidateSceneSettings(OptionalPyblishPluginMixin, diff --git a/client/ayon_core/hosts/blender/addon.py b/client/ayon_core/hosts/blender/addon.py index f1da9b808c..cf8321b51e 100644 --- a/client/ayon_core/hosts/blender/addon.py +++ b/client/ayon_core/hosts/blender/addon.py @@ -1,5 +1,5 @@ import os -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon BLENDER_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/blender/api/action.py b/client/ayon_core/hosts/blender/api/action.py index dc49d6d9ae..865c2443e0 100644 --- a/client/ayon_core/hosts/blender/api/action.py +++ b/client/ayon_core/hosts/blender/api/action.py @@ -2,7 +2,7 @@ import bpy import pyblish.api -from openpype.pipeline.publish import get_errored_instances_from_context +from ayon_core.pipeline.publish import get_errored_instances_from_context class SelectInvalidAction(pyblish.api.Action): diff --git a/client/ayon_core/hosts/blender/api/lib.py b/client/ayon_core/hosts/blender/api/lib.py index e80ed61bc8..a83c950b8f 100644 --- a/client/ayon_core/hosts/blender/api/lib.py +++ b/client/ayon_core/hosts/blender/api/lib.py @@ -6,7 +6,7 @@ from typing import Dict, List, Union import bpy import addon_utils -from openpype.lib import Logger +from ayon_core.lib import Logger from . import pipeline diff --git a/client/ayon_core/hosts/blender/api/ops.py b/client/ayon_core/hosts/blender/api/ops.py index f4d96e563a..e7fa14342b 100644 --- a/client/ayon_core/hosts/blender/api/ops.py +++ b/client/ayon_core/hosts/blender/api/ops.py @@ -15,10 +15,10 @@ from qtpy import QtWidgets, QtCore import bpy import bpy.utils.previews -from openpype import style -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import get_current_asset_name, get_current_task_name -from openpype.tools.utils import host_tools +from ayon_core import style +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import get_current_asset_name, get_current_task_name +from ayon_core.tools.utils import host_tools from .workio import OpenFileCacher from . import pipeline diff --git a/client/ayon_core/hosts/blender/api/pipeline.py b/client/ayon_core/hosts/blender/api/pipeline.py index b386dd49d3..4a7eaef169 100644 --- a/client/ayon_core/hosts/blender/api/pipeline.py +++ b/client/ayon_core/hosts/blender/api/pipeline.py @@ -10,14 +10,14 @@ from . import ops import pyblish.api -from openpype.host import ( +from ayon_core.host import ( HostBase, IWorkfileHost, IPublishHost, ILoadHost ) -from openpype.client import get_asset_by_name -from openpype.pipeline import ( +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline import ( schema, legacy_io, get_current_project_name, @@ -28,13 +28,13 @@ from openpype.pipeline import ( deregister_creator_plugin_path, AVALON_CONTAINER_ID, ) -from openpype.lib import ( +from ayon_core.lib import ( Logger, register_event_callback, emit_event ) -import openpype.hosts.blender -from openpype.settings import get_project_settings +import ayon_core.hosts.blender +from ayon_core.settings import get_project_settings from .workio import ( open_file, save_file, @@ -198,7 +198,7 @@ def uninstall(): def show_message(title, message): - from openpype.widgets.message_window import Window + from ayon_core.widgets.message_window import Window from .ops import BlenderApplication BlenderApplication.get_app() diff --git a/client/ayon_core/hosts/blender/api/plugin.py b/client/ayon_core/hosts/blender/api/plugin.py index b1ff3e4a09..7b4eb6a73f 100644 --- a/client/ayon_core/hosts/blender/api/plugin.py +++ b/client/ayon_core/hosts/blender/api/plugin.py @@ -6,13 +6,13 @@ from typing import Dict, List, Optional import bpy -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import ( Creator, CreatedInstance, LoaderPlugin, ) -from openpype.lib import BoolDef +from ayon_core.lib import BoolDef from .pipeline import ( AVALON_CONTAINERS, @@ -497,7 +497,7 @@ class AssetLoader(LoaderPlugin): # Only containerise if it's not already a collection from a .blend file. # representation = context["representation"]["name"] # if representation != "blend": - # from openpype.hosts.blender.api.pipeline import containerise + # from ayon_core.hosts.blender.api.pipeline import containerise # return containerise( # name=name, # namespace=namespace, diff --git a/client/ayon_core/hosts/blender/api/render_lib.py b/client/ayon_core/hosts/blender/api/render_lib.py index b437078ad8..35aa1f12c9 100644 --- a/client/ayon_core/hosts/blender/api/render_lib.py +++ b/client/ayon_core/hosts/blender/api/render_lib.py @@ -2,8 +2,8 @@ from pathlib import Path import bpy -from openpype.settings import get_project_settings -from openpype.pipeline import get_current_project_name +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import get_current_project_name def get_default_render_folder(settings): diff --git a/client/ayon_core/hosts/blender/blender_addon/startup/init.py b/client/ayon_core/hosts/blender/blender_addon/startup/init.py index 603691675d..816f30f73f 100644 --- a/client/ayon_core/hosts/blender/blender_addon/startup/init.py +++ b/client/ayon_core/hosts/blender/blender_addon/startup/init.py @@ -1,5 +1,5 @@ -from openpype.pipeline import install_host -from openpype.hosts.blender.api import BlenderHost +from ayon_core.pipeline import install_host +from ayon_core.hosts.blender.api import BlenderHost def register(): diff --git a/client/ayon_core/hosts/blender/hooks/pre_add_run_python_script_arg.py b/client/ayon_core/hosts/blender/hooks/pre_add_run_python_script_arg.py index 68c9bfdd57..00b297f998 100644 --- a/client/ayon_core/hosts/blender/hooks/pre_add_run_python_script_arg.py +++ b/client/ayon_core/hosts/blender/hooks/pre_add_run_python_script_arg.py @@ -1,6 +1,6 @@ from pathlib import Path -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class AddPythonScriptToLaunchArgs(PreLaunchHook): diff --git a/client/ayon_core/hosts/blender/hooks/pre_pyside_install.py b/client/ayon_core/hosts/blender/hooks/pre_pyside_install.py index 2aa3a5e49a..c80a1bd669 100644 --- a/client/ayon_core/hosts/blender/hooks/pre_pyside_install.py +++ b/client/ayon_core/hosts/blender/hooks/pre_pyside_install.py @@ -2,7 +2,7 @@ import os import re import subprocess from platform import system -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class InstallPySideToBlender(PreLaunchHook): diff --git a/client/ayon_core/hosts/blender/hooks/pre_windows_console.py b/client/ayon_core/hosts/blender/hooks/pre_windows_console.py index 2161b7a2f5..e3a8593cd9 100644 --- a/client/ayon_core/hosts/blender/hooks/pre_windows_console.py +++ b/client/ayon_core/hosts/blender/hooks/pre_windows_console.py @@ -1,5 +1,5 @@ import subprocess -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class BlenderConsoleWindows(PreLaunchHook): diff --git a/client/ayon_core/hosts/blender/plugins/create/convert_legacy.py b/client/ayon_core/hosts/blender/plugins/create/convert_legacy.py index f05a6b1f5a..fcd4a7a26e 100644 --- a/client/ayon_core/hosts/blender/plugins/create/convert_legacy.py +++ b/client/ayon_core/hosts/blender/plugins/create/convert_legacy.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Converter for legacy Houdini subsets.""" -from openpype.pipeline.create.creator_plugins import SubsetConvertorPlugin -from openpype.hosts.blender.api.lib import imprint +from ayon_core.pipeline.create.creator_plugins import SubsetConvertorPlugin +from ayon_core.hosts.blender.api.lib import imprint class BlenderLegacyConvertor(SubsetConvertorPlugin): diff --git a/client/ayon_core/hosts/blender/plugins/create/create_action.py b/client/ayon_core/hosts/blender/plugins/create/create_action.py index caaa72fe8d..2331daf7b7 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_action.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_action.py @@ -2,7 +2,7 @@ import bpy -from openpype.hosts.blender.api import lib, plugin +from ayon_core.hosts.blender.api import lib, plugin class CreateAction(plugin.BaseCreator): diff --git a/client/ayon_core/hosts/blender/plugins/create/create_animation.py b/client/ayon_core/hosts/blender/plugins/create/create_animation.py index 3a91b2d5ff..8671d3bfdb 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_animation.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_animation.py @@ -1,6 +1,6 @@ """Create an animation asset.""" -from openpype.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api import plugin, lib class CreateAnimation(plugin.BaseCreator): diff --git a/client/ayon_core/hosts/blender/plugins/create/create_blendScene.py b/client/ayon_core/hosts/blender/plugins/create/create_blendScene.py index e1026282c0..6afb2ca6a0 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_blendScene.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_blendScene.py @@ -2,7 +2,7 @@ import bpy -from openpype.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api import plugin, lib class CreateBlendScene(plugin.BaseCreator): diff --git a/client/ayon_core/hosts/blender/plugins/create/create_camera.py b/client/ayon_core/hosts/blender/plugins/create/create_camera.py index 2e2e6cec22..c63a294cf9 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_camera.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_camera.py @@ -2,8 +2,8 @@ import bpy -from openpype.hosts.blender.api import plugin, lib -from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES +from ayon_core.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api.pipeline import AVALON_INSTANCES class CreateCamera(plugin.BaseCreator): diff --git a/client/ayon_core/hosts/blender/plugins/create/create_layout.py b/client/ayon_core/hosts/blender/plugins/create/create_layout.py index 16d227e50e..3da3916aef 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_layout.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_layout.py @@ -2,7 +2,7 @@ import bpy -from openpype.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api import plugin, lib class CreateLayout(plugin.BaseCreator): diff --git a/client/ayon_core/hosts/blender/plugins/create/create_model.py b/client/ayon_core/hosts/blender/plugins/create/create_model.py index 2f3f61728b..b6d89c8862 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_model.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_model.py @@ -2,7 +2,7 @@ import bpy -from openpype.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api import plugin, lib class CreateModel(plugin.BaseCreator): diff --git a/client/ayon_core/hosts/blender/plugins/create/create_pointcache.py b/client/ayon_core/hosts/blender/plugins/create/create_pointcache.py index b3329bcb3b..20ef3fbde4 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_pointcache.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_pointcache.py @@ -1,6 +1,6 @@ """Create a pointcache asset.""" -from openpype.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api import plugin, lib class CreatePointcache(plugin.BaseCreator): diff --git a/client/ayon_core/hosts/blender/plugins/create/create_render.py b/client/ayon_core/hosts/blender/plugins/create/create_render.py index 7fb3e5eb00..82337a47f2 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_render.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_render.py @@ -1,8 +1,8 @@ """Create render.""" import bpy -from openpype.hosts.blender.api import plugin -from openpype.hosts.blender.api.render_lib import prepare_rendering +from ayon_core.hosts.blender.api import plugin +from ayon_core.hosts.blender.api.render_lib import prepare_rendering class CreateRenderlayer(plugin.BaseCreator): diff --git a/client/ayon_core/hosts/blender/plugins/create/create_review.py b/client/ayon_core/hosts/blender/plugins/create/create_review.py index 940bcbea22..cf94819b3e 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_review.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_review.py @@ -1,6 +1,6 @@ """Create review.""" -from openpype.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api import plugin, lib class CreateReview(plugin.BaseCreator): diff --git a/client/ayon_core/hosts/blender/plugins/create/create_rig.py b/client/ayon_core/hosts/blender/plugins/create/create_rig.py index d63b8d56ff..07b33fe4ba 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_rig.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_rig.py @@ -2,7 +2,7 @@ import bpy -from openpype.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api import plugin, lib class CreateRig(plugin.BaseCreator): diff --git a/client/ayon_core/hosts/blender/plugins/create/create_workfile.py b/client/ayon_core/hosts/blender/plugins/create/create_workfile.py index 6b168f4c84..5971b94be5 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_workfile.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_workfile.py @@ -1,10 +1,10 @@ import bpy -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import CreatedInstance, AutoCreator -from openpype.client import get_asset_by_name -from openpype.hosts.blender.api.plugin import BaseCreator -from openpype.hosts.blender.api.pipeline import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import CreatedInstance, AutoCreator +from ayon_core.client import get_asset_by_name +from ayon_core.hosts.blender.api.plugin import BaseCreator +from ayon_core.hosts.blender.api.pipeline import ( AVALON_PROPERTY, AVALON_CONTAINERS ) diff --git a/client/ayon_core/hosts/blender/plugins/load/import_workfile.py b/client/ayon_core/hosts/blender/plugins/load/import_workfile.py index 331f6a8bdb..061c6108ad 100644 --- a/client/ayon_core/hosts/blender/plugins/load/import_workfile.py +++ b/client/ayon_core/hosts/blender/plugins/load/import_workfile.py @@ -1,6 +1,6 @@ import bpy -from openpype.hosts.blender.api import plugin +from ayon_core.hosts.blender.api import plugin def append_workfile(context, fname, do_import): diff --git a/client/ayon_core/hosts/blender/plugins/load/load_abc.py b/client/ayon_core/hosts/blender/plugins/load/load_abc.py index d7e82d1900..b25f4eb277 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_abc.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_abc.py @@ -6,16 +6,16 @@ from typing import Dict, List, Optional import bpy -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AVALON_CONTAINER_ID, ) -from openpype.hosts.blender.api.pipeline import ( +from ayon_core.hosts.blender.api.pipeline import ( AVALON_CONTAINERS, AVALON_PROPERTY, ) -from openpype.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api import plugin, lib class CacheModelLoader(plugin.AssetLoader): diff --git a/client/ayon_core/hosts/blender/plugins/load/load_action.py b/client/ayon_core/hosts/blender/plugins/load/load_action.py index f7d32f92a5..2690f2363e 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_action.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_action.py @@ -6,9 +6,9 @@ from pprint import pformat from typing import Dict, List, Optional import bpy -from openpype.pipeline import get_representation_path -from openpype.hosts.blender.api import plugin -from openpype.hosts.blender.api.pipeline import ( +from ayon_core.pipeline import get_representation_path +from ayon_core.hosts.blender.api import plugin +from ayon_core.hosts.blender.api.pipeline import ( containerise_existing, AVALON_PROPERTY, ) diff --git a/client/ayon_core/hosts/blender/plugins/load/load_animation.py b/client/ayon_core/hosts/blender/plugins/load/load_animation.py index fd087553f0..b805790c28 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_animation.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_animation.py @@ -4,8 +4,8 @@ from typing import Dict, List, Optional import bpy -from openpype.hosts.blender.api import plugin -from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY +from ayon_core.hosts.blender.api import plugin +from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY class BlendAnimationLoader(plugin.AssetLoader): diff --git a/client/ayon_core/hosts/blender/plugins/load/load_audio.py b/client/ayon_core/hosts/blender/plugins/load/load_audio.py index 367fff03f0..007889f6f6 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_audio.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_audio.py @@ -6,12 +6,12 @@ from typing import Dict, List, Optional import bpy -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AVALON_CONTAINER_ID, ) -from openpype.hosts.blender.api import plugin -from openpype.hosts.blender.api.pipeline import ( +from ayon_core.hosts.blender.api import plugin +from ayon_core.hosts.blender.api.pipeline import ( AVALON_CONTAINERS, AVALON_PROPERTY, ) diff --git a/client/ayon_core/hosts/blender/plugins/load/load_blend.py b/client/ayon_core/hosts/blender/plugins/load/load_blend.py index 1a84f5afbb..c9862f9841 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_blend.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_blend.py @@ -3,15 +3,15 @@ from pathlib import Path import bpy -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AVALON_CONTAINER_ID, registered_host ) -from openpype.pipeline.create import CreateContext -from openpype.hosts.blender.api import plugin -from openpype.hosts.blender.api.lib import imprint -from openpype.hosts.blender.api.pipeline import ( +from ayon_core.pipeline.create import CreateContext +from ayon_core.hosts.blender.api import plugin +from ayon_core.hosts.blender.api.lib import imprint +from ayon_core.hosts.blender.api.pipeline import ( AVALON_CONTAINERS, AVALON_PROPERTY, ) diff --git a/client/ayon_core/hosts/blender/plugins/load/load_blendscene.py b/client/ayon_core/hosts/blender/plugins/load/load_blendscene.py index fba0245af1..248bf5a901 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_blendscene.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_blendscene.py @@ -3,13 +3,13 @@ from pathlib import Path import bpy -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AVALON_CONTAINER_ID, ) -from openpype.hosts.blender.api import plugin -from openpype.hosts.blender.api.lib import imprint -from openpype.hosts.blender.api.pipeline import ( +from ayon_core.hosts.blender.api import plugin +from ayon_core.hosts.blender.api.lib import imprint +from ayon_core.hosts.blender.api.pipeline import ( AVALON_CONTAINERS, AVALON_PROPERTY, ) diff --git a/client/ayon_core/hosts/blender/plugins/load/load_camera_abc.py b/client/ayon_core/hosts/blender/plugins/load/load_camera_abc.py index ecd6bb98f1..8f0bd6741d 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_camera_abc.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_camera_abc.py @@ -6,12 +6,12 @@ from typing import Dict, List, Optional import bpy -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AVALON_CONTAINER_ID, ) -from openpype.hosts.blender.api import plugin, lib -from openpype.hosts.blender.api.pipeline import ( +from ayon_core.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api.pipeline import ( AVALON_CONTAINERS, AVALON_PROPERTY, ) diff --git a/client/ayon_core/hosts/blender/plugins/load/load_camera_fbx.py b/client/ayon_core/hosts/blender/plugins/load/load_camera_fbx.py index 2d53d3e573..7642871dc7 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_camera_fbx.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_camera_fbx.py @@ -6,12 +6,12 @@ from typing import Dict, List, Optional import bpy -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AVALON_CONTAINER_ID, ) -from openpype.hosts.blender.api import plugin, lib -from openpype.hosts.blender.api.pipeline import ( +from ayon_core.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api.pipeline import ( AVALON_CONTAINERS, AVALON_PROPERTY, ) diff --git a/client/ayon_core/hosts/blender/plugins/load/load_fbx.py b/client/ayon_core/hosts/blender/plugins/load/load_fbx.py index 8fce53a5d5..03993c9f5e 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_fbx.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_fbx.py @@ -6,12 +6,12 @@ from typing import Dict, List, Optional import bpy -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AVALON_CONTAINER_ID, ) -from openpype.hosts.blender.api import plugin, lib -from openpype.hosts.blender.api.pipeline import ( +from ayon_core.hosts.blender.api import plugin, lib +from ayon_core.hosts.blender.api.pipeline import ( AVALON_CONTAINERS, AVALON_PROPERTY, ) diff --git a/client/ayon_core/hosts/blender/plugins/load/load_layout_json.py b/client/ayon_core/hosts/blender/plugins/load/load_layout_json.py index 748ac619b6..f48862a803 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_layout_json.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_layout_json.py @@ -7,7 +7,7 @@ from typing import Dict, Optional import bpy -from openpype.pipeline import ( +from ayon_core.pipeline import ( discover_loader_plugins, remove_container, load_container, @@ -15,12 +15,12 @@ from openpype.pipeline import ( loaders_from_representation, AVALON_CONTAINER_ID, ) -from openpype.hosts.blender.api.pipeline import ( +from ayon_core.hosts.blender.api.pipeline import ( AVALON_INSTANCES, AVALON_CONTAINERS, AVALON_PROPERTY, ) -from openpype.hosts.blender.api import plugin +from ayon_core.hosts.blender.api import plugin class JsonLayoutLoader(plugin.AssetLoader): diff --git a/client/ayon_core/hosts/blender/plugins/load/load_look.py b/client/ayon_core/hosts/blender/plugins/load/load_look.py index 8d3118d83b..f9ebf98912 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_look.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_look.py @@ -8,9 +8,9 @@ import os import json import bpy -from openpype.pipeline import get_representation_path -from openpype.hosts.blender.api import plugin -from openpype.hosts.blender.api.pipeline import ( +from ayon_core.pipeline import get_representation_path +from ayon_core.hosts.blender.api import plugin +from ayon_core.hosts.blender.api.pipeline import ( containerise_existing, AVALON_PROPERTY ) diff --git a/client/ayon_core/hosts/blender/plugins/publish/collect_current_file.py b/client/ayon_core/hosts/blender/plugins/publish/collect_current_file.py index 91c88f2e28..7370f6cbe8 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/collect_current_file.py +++ b/client/ayon_core/hosts/blender/plugins/publish/collect_current_file.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.hosts.blender.api import workio +from ayon_core.hosts.blender.api import workio class CollectBlenderCurrentFile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py b/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py index 4685472213..f9338cd30a 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py +++ b/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py @@ -2,8 +2,8 @@ import bpy import pyblish.api -from openpype.pipeline.publish import KnownPublishError -from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY +from ayon_core.pipeline.publish import KnownPublishError +from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY class CollectBlenderInstanceData(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/blender/plugins/publish/collect_render.py b/client/ayon_core/hosts/blender/plugins/publish/collect_render.py index da02f99052..1ad2de2b7d 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/collect_render.py +++ b/client/ayon_core/hosts/blender/plugins/publish/collect_render.py @@ -6,7 +6,7 @@ import re import bpy -from openpype.hosts.blender.api import colorspace +from ayon_core.hosts.blender.api import colorspace import pyblish.api diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_abc.py b/client/ayon_core/hosts/blender/plugins/publish/extract_abc.py index 0e242e9d53..2f89426e56 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/extract_abc.py +++ b/client/ayon_core/hosts/blender/plugins/publish/extract_abc.py @@ -2,8 +2,8 @@ import os import bpy -from openpype.pipeline import publish -from openpype.hosts.blender.api import plugin +from ayon_core.pipeline import publish +from ayon_core.hosts.blender.api import plugin class ExtractABC(publish.Extractor, publish.OptionalPyblishPluginMixin): diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_abc_animation.py b/client/ayon_core/hosts/blender/plugins/publish/extract_abc_animation.py index 2bf75aa05e..41ad2a99b8 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/extract_abc_animation.py +++ b/client/ayon_core/hosts/blender/plugins/publish/extract_abc_animation.py @@ -2,8 +2,8 @@ import os import bpy -from openpype.pipeline import publish -from openpype.hosts.blender.api import plugin +from ayon_core.pipeline import publish +from ayon_core.hosts.blender.api import plugin class ExtractAnimationABC( diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_blend.py b/client/ayon_core/hosts/blender/plugins/publish/extract_blend.py index 94e87d537c..00e4074f55 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/extract_blend.py +++ b/client/ayon_core/hosts/blender/plugins/publish/extract_blend.py @@ -2,7 +2,7 @@ import os import bpy -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractBlend(publish.Extractor, publish.OptionalPyblishPluginMixin): diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_blend_animation.py b/client/ayon_core/hosts/blender/plugins/publish/extract_blend_animation.py index 11eb268271..6b0d6195b6 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/extract_blend_animation.py +++ b/client/ayon_core/hosts/blender/plugins/publish/extract_blend_animation.py @@ -2,7 +2,7 @@ import os import bpy -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractBlendAnimation( diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_camera_abc.py b/client/ayon_core/hosts/blender/plugins/publish/extract_camera_abc.py index df68668eae..efa1faa87c 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/extract_camera_abc.py +++ b/client/ayon_core/hosts/blender/plugins/publish/extract_camera_abc.py @@ -2,9 +2,9 @@ import os import bpy -from openpype.pipeline import publish -from openpype.hosts.blender.api import plugin -from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY +from ayon_core.pipeline import publish +from ayon_core.hosts.blender.api import plugin +from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY class ExtractCameraABC(publish.Extractor, publish.OptionalPyblishPluginMixin): diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_camera_fbx.py b/client/ayon_core/hosts/blender/plugins/publish/extract_camera_fbx.py index f904b79ddb..b2b6cd602d 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/extract_camera_fbx.py +++ b/client/ayon_core/hosts/blender/plugins/publish/extract_camera_fbx.py @@ -2,8 +2,8 @@ import os import bpy -from openpype.pipeline import publish -from openpype.hosts.blender.api import plugin +from ayon_core.pipeline import publish +from ayon_core.hosts.blender.api import plugin class ExtractCamera(publish.Extractor, publish.OptionalPyblishPluginMixin): diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_fbx.py b/client/ayon_core/hosts/blender/plugins/publish/extract_fbx.py index aed6df1d3d..7e8c13fea8 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/extract_fbx.py +++ b/client/ayon_core/hosts/blender/plugins/publish/extract_fbx.py @@ -2,9 +2,9 @@ import os import bpy -from openpype.pipeline import publish -from openpype.hosts.blender.api import plugin -from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY +from ayon_core.pipeline import publish +from ayon_core.hosts.blender.api import plugin +from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY class ExtractFBX(publish.Extractor, publish.OptionalPyblishPluginMixin): diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_fbx_animation.py b/client/ayon_core/hosts/blender/plugins/publish/extract_fbx_animation.py index 1cb8dac0cf..3ad4cc3aa9 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/extract_fbx_animation.py +++ b/client/ayon_core/hosts/blender/plugins/publish/extract_fbx_animation.py @@ -5,9 +5,9 @@ import bpy import bpy_extras import bpy_extras.anim_utils -from openpype.pipeline import publish -from openpype.hosts.blender.api import plugin -from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY +from ayon_core.pipeline import publish +from ayon_core.hosts.blender.api import plugin +from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY def get_all_parents(obj): diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_layout.py b/client/ayon_core/hosts/blender/plugins/publish/extract_layout.py index 383c3bdcc5..f868db3e74 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/extract_layout.py +++ b/client/ayon_core/hosts/blender/plugins/publish/extract_layout.py @@ -5,10 +5,10 @@ import bpy import bpy_extras import bpy_extras.anim_utils -from openpype.client import get_representation_by_name -from openpype.pipeline import publish -from openpype.hosts.blender.api import plugin -from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY +from ayon_core.client import get_representation_by_name +from ayon_core.pipeline import publish +from ayon_core.hosts.blender.api import plugin +from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY class ExtractLayout(publish.Extractor, publish.OptionalPyblishPluginMixin): diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py b/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py index a78aa14138..83e6b26fbe 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py +++ b/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py @@ -4,9 +4,9 @@ import clique import bpy import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.blender.api import capture -from openpype.hosts.blender.api.lib import maintained_time +from ayon_core.pipeline import publish +from ayon_core.hosts.blender.api import capture +from ayon_core.hosts.blender.api.lib import maintained_time class ExtractPlayblast(publish.Extractor, publish.OptionalPyblishPluginMixin): diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py b/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py index e593e0de27..7b445a0113 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py +++ b/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py @@ -2,9 +2,9 @@ import os import glob import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.blender.api import capture -from openpype.hosts.blender.api.lib import maintained_time +from ayon_core.pipeline import publish +from ayon_core.hosts.blender.api import capture +from ayon_core.hosts.blender.api.lib import maintained_time import bpy diff --git a/client/ayon_core/hosts/blender/plugins/publish/increment_workfile_version.py b/client/ayon_core/hosts/blender/plugins/publish/increment_workfile_version.py index 9f8d20aedc..b6e0ea3e19 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/increment_workfile_version.py +++ b/client/ayon_core/hosts/blender/plugins/publish/increment_workfile_version.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import OptionalPyblishPluginMixin -from openpype.hosts.blender.api.workio import save_file +from ayon_core.pipeline.publish import OptionalPyblishPluginMixin +from ayon_core.hosts.blender.api.workio import save_file class IncrementWorkfileVersion( @@ -23,7 +23,7 @@ class IncrementWorkfileVersion( assert all(result["success"] for result in context.data["results"]), ( "Publishing not successful so version is not increased.") - from openpype.lib import version_up + from ayon_core.lib import version_up path = context.data["currentFile"] filepath = version_up(path) diff --git a/client/ayon_core/hosts/blender/plugins/publish/integrate_animation.py b/client/ayon_core/hosts/blender/plugins/publish/integrate_animation.py index 623da9c585..c461d56e7c 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/integrate_animation.py +++ b/client/ayon_core/hosts/blender/plugins/publish/integrate_animation.py @@ -1,7 +1,7 @@ import json import pyblish.api -from openpype.pipeline.publish import OptionalPyblishPluginMixin +from ayon_core.pipeline.publish import OptionalPyblishPluginMixin class IntegrateAnimation( diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_camera_zero_keyframe.py b/client/ayon_core/hosts/blender/plugins/publish/validate_camera_zero_keyframe.py index 9b6e513897..4bda258410 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/validate_camera_zero_keyframe.py +++ b/client/ayon_core/hosts/blender/plugins/publish/validate_camera_zero_keyframe.py @@ -4,8 +4,8 @@ import bpy import pyblish.api -import openpype.hosts.blender.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.blender.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError, OptionalPyblishPluginMixin diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_deadline_publish.py b/client/ayon_core/hosts/blender/plugins/publish/validate_deadline_publish.py index bb243f08cc..b9310f9da0 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/validate_deadline_publish.py +++ b/client/ayon_core/hosts/blender/plugins/publish/validate_deadline_publish.py @@ -3,13 +3,13 @@ import os import bpy import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError, OptionalPyblishPluginMixin ) -from openpype.hosts.blender.api.render_lib import prepare_rendering +from ayon_core.hosts.blender.api.render_lib import prepare_rendering class ValidateDeadlinePublish(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_file_saved.py b/client/ayon_core/hosts/blender/plugins/publish/validate_file_saved.py index 442f856e05..0b8762fed5 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/validate_file_saved.py +++ b/client/ayon_core/hosts/blender/plugins/publish/validate_file_saved.py @@ -2,7 +2,7 @@ import bpy import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError ) diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_instance_empty.py b/client/ayon_core/hosts/blender/plugins/publish/validate_instance_empty.py index 51a1dcf6ca..f0f4106379 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/validate_instance_empty.py +++ b/client/ayon_core/hosts/blender/plugins/publish/validate_instance_empty.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline.publish import PublishValidationError +from ayon_core.pipeline.publish import PublishValidationError class ValidateInstanceEmpty(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_mesh_has_uv.py b/client/ayon_core/hosts/blender/plugins/publish/validate_mesh_has_uv.py index 060bccbd04..b99e3a96de 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/validate_mesh_has_uv.py +++ b/client/ayon_core/hosts/blender/plugins/publish/validate_mesh_has_uv.py @@ -4,12 +4,12 @@ import bpy import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, OptionalPyblishPluginMixin, PublishValidationError ) -import openpype.hosts.blender.api.action +import ayon_core.hosts.blender.api.action class ValidateMeshHasUvs( diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_mesh_no_negative_scale.py b/client/ayon_core/hosts/blender/plugins/publish/validate_mesh_no_negative_scale.py index 7f77bbe38c..6243255961 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/validate_mesh_no_negative_scale.py +++ b/client/ayon_core/hosts/blender/plugins/publish/validate_mesh_no_negative_scale.py @@ -4,12 +4,12 @@ import bpy import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, OptionalPyblishPluginMixin, PublishValidationError ) -import openpype.hosts.blender.api.action +import ayon_core.hosts.blender.api.action class ValidateMeshNoNegativeScale(pyblish.api.Validator, diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_no_colons_in_name.py b/client/ayon_core/hosts/blender/plugins/publish/validate_no_colons_in_name.py index caf555b535..9f9905778a 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/validate_no_colons_in_name.py +++ b/client/ayon_core/hosts/blender/plugins/publish/validate_no_colons_in_name.py @@ -4,8 +4,8 @@ import bpy import pyblish.api -import openpype.hosts.blender.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.blender.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, OptionalPyblishPluginMixin, PublishValidationError diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_object_mode.py b/client/ayon_core/hosts/blender/plugins/publish/validate_object_mode.py index ab5f4bb467..063557322b 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/validate_object_mode.py +++ b/client/ayon_core/hosts/blender/plugins/publish/validate_object_mode.py @@ -3,11 +3,11 @@ from typing import List import bpy import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError ) -import openpype.hosts.blender.api.action +import ayon_core.hosts.blender.api.action class ValidateObjectIsInObjectMode( diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_render_camera_is_set.py b/client/ayon_core/hosts/blender/plugins/publish/validate_render_camera_is_set.py index 86d1fcc681..46bfe45739 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/validate_render_camera_is_set.py +++ b/client/ayon_core/hosts/blender/plugins/publish/validate_render_camera_is_set.py @@ -2,7 +2,7 @@ import bpy import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError ) diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py b/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py index 1fb9535ee4..16d1c3388f 100644 --- a/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py +++ b/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py @@ -5,8 +5,8 @@ import bpy import pyblish.api -import openpype.hosts.blender.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.blender.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, OptionalPyblishPluginMixin, PublishValidationError diff --git a/client/ayon_core/hosts/celaction/addon.py b/client/ayon_core/hosts/celaction/addon.py index 9158010011..4573ee7e56 100644 --- a/client/ayon_core/hosts/celaction/addon.py +++ b/client/ayon_core/hosts/celaction/addon.py @@ -1,5 +1,5 @@ import os -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon CELACTION_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/celaction/hooks/pre_celaction_setup.py b/client/ayon_core/hosts/celaction/hooks/pre_celaction_setup.py index 83aeab7c58..66be3a36b2 100644 --- a/client/ayon_core/hosts/celaction/hooks/pre_celaction_setup.py +++ b/client/ayon_core/hosts/celaction/hooks/pre_celaction_setup.py @@ -2,9 +2,9 @@ import os import shutil import winreg import subprocess -from openpype.lib import get_openpype_execute_args -from openpype.lib.applications import PreLaunchHook, LaunchTypes -from openpype.hosts.celaction import CELACTION_ROOT_DIR +from ayon_core.lib import get_openpype_execute_args +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.hosts.celaction import CELACTION_ROOT_DIR class CelactionPrelaunchHook(PreLaunchHook): diff --git a/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py b/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py index 875f15fcc5..d0f4c59290 100644 --- a/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py +++ b/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py @@ -1,7 +1,7 @@ import os import pyblish.api -from openpype.client import get_asset_name_identifier +from ayon_core.client import get_asset_name_identifier class CollectCelactionInstances(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/celaction/plugins/publish/integrate_version_up.py b/client/ayon_core/hosts/celaction/plugins/publish/integrate_version_up.py index dc08127a8a..c165b0c871 100644 --- a/client/ayon_core/hosts/celaction/plugins/publish/integrate_version_up.py +++ b/client/ayon_core/hosts/celaction/plugins/publish/integrate_version_up.py @@ -1,7 +1,9 @@ import shutil -import openpype + import pyblish.api +from ayon_core.lib import version_up + class VersionUpScene(pyblish.api.ContextPlugin): order = pyblish.api.IntegratorOrder + 0.5 @@ -12,7 +14,7 @@ class VersionUpScene(pyblish.api.ContextPlugin): def process(self, context): current_file = context.data.get('currentFile') - v_up = openpype.lib.version_up(current_file) + v_up = version_up(current_file) self.log.debug('Current file is: {}'.format(current_file)) self.log.debug('Version up: {}'.format(v_up)) diff --git a/client/ayon_core/hosts/celaction/scripts/publish_cli.py b/client/ayon_core/hosts/celaction/scripts/publish_cli.py index 39d3f1a94d..31309ccd4c 100644 --- a/client/ayon_core/hosts/celaction/scripts/publish_cli.py +++ b/client/ayon_core/hosts/celaction/scripts/publish_cli.py @@ -4,10 +4,10 @@ import sys import pyblish.api import pyblish.util -import openpype.hosts.celaction -from openpype.lib import Logger -from openpype.tools.utils import host_tools -from openpype.pipeline import install_openpype_plugins +import ayon_core.hosts.celaction +from ayon_core.lib import Logger +from ayon_core.tools.utils import host_tools +from ayon_core.pipeline import install_openpype_plugins log = Logger.get_logger("celaction") diff --git a/client/ayon_core/hosts/flame/addon.py b/client/ayon_core/hosts/flame/addon.py index d9359fc5bf..e30d7cab08 100644 --- a/client/ayon_core/hosts/flame/addon.py +++ b/client/ayon_core/hosts/flame/addon.py @@ -1,5 +1,5 @@ import os -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon HOST_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/flame/api/lib.py b/client/ayon_core/hosts/flame/api/lib.py index ab713aed84..efa23fe01e 100644 --- a/client/ayon_core/hosts/flame/api/lib.py +++ b/client/ayon_core/hosts/flame/api/lib.py @@ -13,7 +13,7 @@ from copy import deepcopy, copy from xml.etree import ElementTree as ET from pprint import pformat -from openpype.lib import Logger, run_subprocess +from ayon_core.lib import Logger, run_subprocess from .constants import ( MARKER_COLOR, diff --git a/client/ayon_core/hosts/flame/api/menu.py b/client/ayon_core/hosts/flame/api/menu.py index e8bdf32ebd..7e880483f5 100644 --- a/client/ayon_core/hosts/flame/api/menu.py +++ b/client/ayon_core/hosts/flame/api/menu.py @@ -3,8 +3,8 @@ from pprint import pformat from qtpy import QtWidgets -from openpype.pipeline import get_current_project_name -from openpype.tools.utils.host_tools import HostToolsHelper +from ayon_core.pipeline import get_current_project_name +from ayon_core.tools.utils.host_tools import HostToolsHelper menu_group_name = 'OpenPype' @@ -28,7 +28,7 @@ default_flame_export_presets = { def callback_selection(selection, function): - import openpype.hosts.flame.api as opfapi + import ayon_core.hosts.flame.api as opfapi opfapi.CTX.selection = selection print("Hook Selection: \n\t{}".format( pformat({ diff --git a/client/ayon_core/hosts/flame/api/pipeline.py b/client/ayon_core/hosts/flame/api/pipeline.py index d6fbf750ba..88375f829f 100644 --- a/client/ayon_core/hosts/flame/api/pipeline.py +++ b/client/ayon_core/hosts/flame/api/pipeline.py @@ -5,8 +5,8 @@ import os import contextlib from pyblish import api as pyblish -from openpype.lib import Logger -from openpype.pipeline import ( +from ayon_core.lib import Logger +from ayon_core.pipeline import ( register_loader_plugin_path, register_creator_plugin_path, deregister_loader_plugin_path, @@ -113,7 +113,7 @@ def on_pyblish_instance_toggled(instance, old_value, new_value): log.info("instance toggle: {}, old_value: {}, new_value:{} ".format( instance, old_value, new_value)) - # from openpype.hosts.resolve import ( + # from ayon_core.hosts.resolve import ( # set_publish_attribute # ) diff --git a/client/ayon_core/hosts/flame/api/plugin.py b/client/ayon_core/hosts/flame/api/plugin.py index 3289187fa0..720e6792b0 100644 --- a/client/ayon_core/hosts/flame/api/plugin.py +++ b/client/ayon_core/hosts/flame/api/plugin.py @@ -7,11 +7,11 @@ from xml.etree import ElementTree as ET import qargparse from qtpy import QtCore, QtWidgets -from openpype import style -from openpype.lib import Logger, StringTemplate -from openpype.pipeline import LegacyCreator, LoaderPlugin -from openpype.pipeline.colorspace import get_remapped_colorspace_to_native -from openpype.settings import get_current_project_settings +from ayon_core import style +from ayon_core.lib import Logger, StringTemplate +from ayon_core.pipeline import LegacyCreator, LoaderPlugin +from ayon_core.pipeline.colorspace import get_remapped_colorspace_to_native +from ayon_core.settings import get_current_project_settings from . import constants from . import lib as flib diff --git a/client/ayon_core/hosts/flame/api/render_utils.py b/client/ayon_core/hosts/flame/api/render_utils.py index 7e50c2b23e..a0c77cb155 100644 --- a/client/ayon_core/hosts/flame/api/render_utils.py +++ b/client/ayon_core/hosts/flame/api/render_utils.py @@ -1,6 +1,6 @@ import os from xml.etree import ElementTree as ET -from openpype.lib import Logger +from ayon_core.lib import Logger log = Logger.get_logger(__name__) diff --git a/client/ayon_core/hosts/flame/api/utils.py b/client/ayon_core/hosts/flame/api/utils.py index 80a5c47e89..91584456a6 100644 --- a/client/ayon_core/hosts/flame/api/utils.py +++ b/client/ayon_core/hosts/flame/api/utils.py @@ -4,7 +4,7 @@ Flame utils for syncing scripts import os import shutil -from openpype.lib import Logger +from ayon_core.lib import Logger log = Logger.get_logger(__name__) diff --git a/client/ayon_core/hosts/flame/api/workio.py b/client/ayon_core/hosts/flame/api/workio.py index e49321c75a..0e3cb7f5fd 100644 --- a/client/ayon_core/hosts/flame/api/workio.py +++ b/client/ayon_core/hosts/flame/api/workio.py @@ -1,7 +1,7 @@ """Host API required Work Files tool""" import os -from openpype.lib import Logger +from ayon_core.lib import Logger # from .. import ( # get_project_manager, # get_current_project diff --git a/client/ayon_core/hosts/flame/hooks/pre_flame_setup.py b/client/ayon_core/hosts/flame/hooks/pre_flame_setup.py index 850569cfdd..4da262ca9e 100644 --- a/client/ayon_core/hosts/flame/hooks/pre_flame_setup.py +++ b/client/ayon_core/hosts/flame/hooks/pre_flame_setup.py @@ -5,12 +5,12 @@ import contextlib import socket from pprint import pformat -from openpype.lib import ( +from ayon_core.lib import ( get_openpype_username, run_subprocess, ) -from openpype.lib.applications import PreLaunchHook, LaunchTypes -from openpype.hosts import flame as opflame +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.hosts import flame as opflame class FlamePrelaunch(PreLaunchHook): diff --git a/client/ayon_core/hosts/flame/otio/flame_export.py b/client/ayon_core/hosts/flame/otio/flame_export.py index 6d6b33d2a1..e5ea4dcf5e 100644 --- a/client/ayon_core/hosts/flame/otio/flame_export.py +++ b/client/ayon_core/hosts/flame/otio/flame_export.py @@ -275,7 +275,7 @@ def create_otio_reference(clip_data, fps=None): def create_otio_clip(clip_data): - from openpype.hosts.flame.api import MediaInfoFile, TimeEffectMetadata + from ayon_core.hosts.flame.api import MediaInfoFile, TimeEffectMetadata segment = clip_data["PySegment"] diff --git a/client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py b/client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py index b01354c313..ee99040ca3 100644 --- a/client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py +++ b/client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py @@ -1,5 +1,5 @@ from copy import deepcopy -import openpype.hosts.flame.api as opfapi +import ayon_core.hosts.flame.api as opfapi class CreateShotClip(opfapi.Creator): diff --git a/client/ayon_core/hosts/flame/plugins/load/load_clip.py b/client/ayon_core/hosts/flame/plugins/load/load_clip.py index ca4eab0f63..6f35196932 100644 --- a/client/ayon_core/hosts/flame/plugins/load/load_clip.py +++ b/client/ayon_core/hosts/flame/plugins/load/load_clip.py @@ -2,9 +2,9 @@ from copy import deepcopy import os import flame from pprint import pformat -import openpype.hosts.flame.api as opfapi -from openpype.lib import StringTemplate -from openpype.lib.transcoding import ( +import ayon_core.hosts.flame.api as opfapi +from ayon_core.lib import StringTemplate +from ayon_core.lib.transcoding import ( VIDEO_EXTENSIONS, IMAGE_EXTENSIONS ) diff --git a/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py b/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py index 1f3a017d72..a66bf53622 100644 --- a/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py +++ b/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py @@ -2,9 +2,9 @@ from copy import deepcopy import os import flame from pprint import pformat -import openpype.hosts.flame.api as opfapi -from openpype.lib import StringTemplate -from openpype.lib.transcoding import ( +import ayon_core.hosts.flame.api as opfapi +from ayon_core.lib import StringTemplate +from ayon_core.lib.transcoding import ( VIDEO_EXTENSIONS, IMAGE_EXTENSIONS ) diff --git a/client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py b/client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py index 9f982321cc..0fb41eab78 100644 --- a/client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py +++ b/client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py @@ -1,8 +1,8 @@ import os import pyblish.api import tempfile -import openpype.hosts.flame.api as opfapi -from openpype.hosts.flame.otio import flame_export as otio_export +import ayon_core.hosts.flame.api as opfapi +from ayon_core.hosts.flame.otio import flame_export as otio_export import opentimelineio as otio from pprint import pformat reload(otio_export) # noqa diff --git a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py b/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py index e14f960a2b..636cbd8031 100644 --- a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py +++ b/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py @@ -1,9 +1,9 @@ import re from types import NoneType import pyblish -import openpype.hosts.flame.api as opfapi -from openpype.hosts.flame.otio import flame_export -from openpype.pipeline.editorial import ( +import ayon_core.hosts.flame.api as opfapi +from ayon_core.hosts.flame.otio import flame_export +from ayon_core.pipeline.editorial import ( is_overlapping_otio_ranges, get_media_range_with_retimes ) diff --git a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py b/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py index 20ac048986..6a3e99aa55 100644 --- a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py +++ b/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py @@ -1,9 +1,9 @@ import pyblish.api -from openpype.client import get_asset_name_identifier -import openpype.hosts.flame.api as opfapi -from openpype.hosts.flame.otio import flame_export -from openpype.pipeline.create import get_subset_name +from ayon_core.client import get_asset_name_identifier +import ayon_core.hosts.flame.api as opfapi +from ayon_core.hosts.flame.otio import flame_export +from ayon_core.pipeline.create import get_subset_name class CollecTimelineOTIO(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/flame/plugins/publish/extract_otio_file.py b/client/ayon_core/hosts/flame/plugins/publish/extract_otio_file.py index e5bfa42ce6..41ae981cba 100644 --- a/client/ayon_core/hosts/flame/plugins/publish/extract_otio_file.py +++ b/client/ayon_core/hosts/flame/plugins/publish/extract_otio_file.py @@ -1,7 +1,7 @@ import os import pyblish.api import opentimelineio as otio -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractOTIOFile(publish.Extractor): diff --git a/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py b/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py index a7979ab4d5..af699fd03a 100644 --- a/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py +++ b/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py @@ -5,10 +5,10 @@ from copy import deepcopy import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.flame import api as opfapi -from openpype.hosts.flame.api import MediaInfoFile -from openpype.pipeline.editorial import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.flame import api as opfapi +from ayon_core.hosts.flame.api import MediaInfoFile +from ayon_core.pipeline.editorial import ( get_media_range_with_retimes ) diff --git a/client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py b/client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py index 4f3945bb0f..3458bd3002 100644 --- a/client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py +++ b/client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py @@ -3,9 +3,9 @@ import copy from collections import OrderedDict from pprint import pformat import pyblish -import openpype.hosts.flame.api as opfapi -import openpype.pipeline as op_pipeline -from openpype.pipeline.workfile import get_workdir +import ayon_core.hosts.flame.api as opfapi +import ayon_core.pipeline as op_pipeline +from ayon_core.pipeline.workfile import get_workdir class IntegrateBatchGroup(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/flame/startup/openpype_in_flame.py b/client/ayon_core/hosts/flame/startup/openpype_in_flame.py index 39869333aa..cf0a24ede2 100644 --- a/client/ayon_core/hosts/flame/startup/openpype_in_flame.py +++ b/client/ayon_core/hosts/flame/startup/openpype_in_flame.py @@ -4,8 +4,8 @@ from qtpy import QtWidgets from pprint import pformat import atexit -import openpype.hosts.flame.api as opfapi -from openpype.pipeline import ( +import ayon_core.hosts.flame.api as opfapi +from ayon_core.pipeline import ( install_host, registered_host, ) diff --git a/client/ayon_core/hosts/fusion/addon.py b/client/ayon_core/hosts/fusion/addon.py index 8343f3c79d..67ff5fbe6b 100644 --- a/client/ayon_core/hosts/fusion/addon.py +++ b/client/ayon_core/hosts/fusion/addon.py @@ -1,7 +1,7 @@ import os import re -from openpype.modules import OpenPypeModule, IHostAddon -from openpype.lib import Logger +from ayon_core.modules import OpenPypeModule, IHostAddon +from ayon_core.lib import Logger FUSION_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/fusion/api/action.py b/client/ayon_core/hosts/fusion/api/action.py index 66b787c2f1..1643f1ce03 100644 --- a/client/ayon_core/hosts/fusion/api/action.py +++ b/client/ayon_core/hosts/fusion/api/action.py @@ -1,8 +1,8 @@ import pyblish.api -from openpype.hosts.fusion.api.lib import get_current_comp -from openpype.pipeline.publish import get_errored_instances_from_context +from ayon_core.hosts.fusion.api.lib import get_current_comp +from ayon_core.pipeline.publish import get_errored_instances_from_context class SelectInvalidAction(pyblish.api.Action): diff --git a/client/ayon_core/hosts/fusion/api/lib.py b/client/ayon_core/hosts/fusion/api/lib.py index 85f9c54a73..88ecfb81f7 100644 --- a/client/ayon_core/hosts/fusion/api/lib.py +++ b/client/ayon_core/hosts/fusion/api/lib.py @@ -3,8 +3,8 @@ import sys import re import contextlib -from openpype.lib import Logger -from openpype.client import ( +from ayon_core.lib import Logger +from ayon_core.client import ( get_asset_by_name, get_subset_by_name, get_last_version_by_subset_id, @@ -12,11 +12,11 @@ from openpype.client import ( get_representation_by_name, get_representation_parents, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( switch_container, get_current_project_name, ) -from openpype.pipeline.context_tools import get_current_project_asset +from ayon_core.pipeline.context_tools import get_current_project_asset self = sys.modules[__name__] self._project = None @@ -165,8 +165,8 @@ def validate_comp_prefs(comp=None, force_repair=False): return from . import menu - from openpype.widgets import popup - from openpype.style import load_stylesheet + from ayon_core.widgets import popup + from ayon_core.style import load_stylesheet dialog = popup.Popup(parent=menu.menu) dialog.setWindowTitle("Fusion comp has invalid configuration") diff --git a/client/ayon_core/hosts/fusion/api/menu.py b/client/ayon_core/hosts/fusion/api/menu.py index 0b9ad1a43b..fb1f6dad19 100644 --- a/client/ayon_core/hosts/fusion/api/menu.py +++ b/client/ayon_core/hosts/fusion/api/menu.py @@ -3,18 +3,18 @@ import sys from qtpy import QtWidgets, QtCore, QtGui -from openpype.tools.utils import host_tools -from openpype.style import load_stylesheet -from openpype.lib import register_event_callback -from openpype.hosts.fusion.scripts import ( +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 ( duplicate_with_inputs, ) -from openpype.hosts.fusion.api.lib import ( +from ayon_core.hosts.fusion.api.lib import ( set_asset_framerange, set_asset_resolution, ) -from openpype.pipeline import get_current_asset_name -from openpype.resources import get_openpype_icon_filepath +from ayon_core.pipeline import get_current_asset_name +from ayon_core.resources import get_openpype_icon_filepath from .pipeline import FusionEventHandler from .pulse import FusionPulse diff --git a/client/ayon_core/hosts/fusion/api/pipeline.py b/client/ayon_core/hosts/fusion/api/pipeline.py index a886086758..98c7e0f1db 100644 --- a/client/ayon_core/hosts/fusion/api/pipeline.py +++ b/client/ayon_core/hosts/fusion/api/pipeline.py @@ -9,21 +9,21 @@ import contextlib import pyblish.api from qtpy import QtCore -from openpype.lib import ( +from ayon_core.lib import ( Logger, register_event_callback, emit_event ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( register_loader_plugin_path, register_creator_plugin_path, register_inventory_action_path, AVALON_CONTAINER_ID, ) -from openpype.pipeline.load import any_outdated_containers -from openpype.hosts.fusion import FUSION_HOST_DIR -from openpype.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost -from openpype.tools.utils import host_tools +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 .lib import ( @@ -189,8 +189,8 @@ def on_after_open(event): frame.ActivateFrame() # raise comp window host_tools.show_scene_inventory() - from openpype.widgets import popup - from openpype.style import load_stylesheet + from ayon_core.widgets import popup + from ayon_core.style import load_stylesheet dialog = popup.Popup(parent=menu.menu) dialog.setWindowTitle("Fusion comp has outdated content") dialog.setMessage("There are outdated containers in " diff --git a/client/ayon_core/hosts/fusion/api/plugin.py b/client/ayon_core/hosts/fusion/api/plugin.py index 63a74fbdb5..12a29d2986 100644 --- a/client/ayon_core/hosts/fusion/api/plugin.py +++ b/client/ayon_core/hosts/fusion/api/plugin.py @@ -1,16 +1,16 @@ from copy import deepcopy import os -from openpype.hosts.fusion.api import ( +from ayon_core.hosts.fusion.api import ( get_current_comp, comp_lock_and_undo_chunk, ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef, EnumDef, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( legacy_io, Creator, CreatedInstance diff --git a/client/ayon_core/hosts/fusion/deploy/MenuScripts/launch_menu.py b/client/ayon_core/hosts/fusion/deploy/MenuScripts/launch_menu.py index 1c58ee50e4..23b02b1b69 100644 --- a/client/ayon_core/hosts/fusion/deploy/MenuScripts/launch_menu.py +++ b/client/ayon_core/hosts/fusion/deploy/MenuScripts/launch_menu.py @@ -5,8 +5,8 @@ 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 openpype import PACKAGE_DIR - FUSION_HOST_DIR = os.path.join(PACKAGE_DIR, "hosts", "fusion") + from ayon_core import AYON_CORE_ROOT + FUSION_HOST_DIR = os.path.join(AYON_CORE_ROOT, "hosts", "fusion") vendor_path = os.path.join(FUSION_HOST_DIR, "vendor") if vendor_path not in sys.path: @@ -14,8 +14,8 @@ if sys.version_info < (3, 7): print(f"Added vendorized libraries from {vendor_path}") -from openpype.lib import Logger -from openpype.pipeline import ( +from ayon_core.lib import Logger +from ayon_core.pipeline import ( install_host, registered_host, ) @@ -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 openpype.hosts.fusion.api import FusionHost - from openpype.hosts.fusion.api import menu + from ayon_core.hosts.fusion.api import FusionHost + from ayon_core.hosts.fusion.api import menu # activate resolve from pype install_host(FusionHost()) diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py b/client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py index 59053ba62a..e85faa092c 100644 --- a/client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -2,13 +2,13 @@ import os import shutil import platform from pathlib import Path -from openpype import AYON_SERVER_ENABLED -from openpype.hosts.fusion import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.hosts.fusion import ( FUSION_HOST_DIR, FUSION_VERSIONS_DICT, get_fusion_version, ) -from openpype.lib.applications import ( +from ayon_core.lib.applications import ( PreLaunchHook, LaunchTypes, ApplicationLaunchFailed, diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py b/client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py index 3da8968727..4a6ffcbb25 100644 --- a/client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py +++ b/client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py @@ -1,10 +1,10 @@ import os -from openpype.lib.applications import ( +from ayon_core.lib.applications import ( PreLaunchHook, LaunchTypes, ApplicationLaunchFailed, ) -from openpype.hosts.fusion import ( +from ayon_core.hosts.fusion import ( FUSION_HOST_DIR, FUSION_VERSIONS_DICT, get_fusion_version, diff --git a/client/ayon_core/hosts/fusion/hooks/pre_pyside_install.py b/client/ayon_core/hosts/fusion/hooks/pre_pyside_install.py index f98aeda233..a9db39e24e 100644 --- a/client/ayon_core/hosts/fusion/hooks/pre_pyside_install.py +++ b/client/ayon_core/hosts/fusion/hooks/pre_pyside_install.py @@ -3,7 +3,7 @@ import subprocess import platform import uuid -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class InstallPySideToFusion(PreLaunchHook): diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py b/client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py index 490228d488..856d86cff6 100644 --- a/client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py +++ b/client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py @@ -1,7 +1,7 @@ -from openpype.lib import NumberDef +from ayon_core.lib import NumberDef -from openpype.hosts.fusion.api.plugin import GenericCreateSaver -from openpype.hosts.fusion.api import get_current_comp +from ayon_core.hosts.fusion.api.plugin import GenericCreateSaver +from ayon_core.hosts.fusion.api import get_current_comp class CreateImageSaver(GenericCreateSaver): diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_saver.py b/client/ayon_core/hosts/fusion/plugins/create/create_saver.py index 3a8ffe890b..1a0dad7060 100644 --- a/client/ayon_core/hosts/fusion/plugins/create/create_saver.py +++ b/client/ayon_core/hosts/fusion/plugins/create/create_saver.py @@ -1,6 +1,6 @@ -from openpype.lib import EnumDef +from ayon_core.lib import EnumDef -from openpype.hosts.fusion.api.plugin import GenericCreateSaver +from ayon_core.hosts.fusion.api.plugin import GenericCreateSaver class CreateSaver(GenericCreateSaver): diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_workfile.py b/client/ayon_core/hosts/fusion/plugins/create/create_workfile.py index 4092086ea4..440c3313b7 100644 --- a/client/ayon_core/hosts/fusion/plugins/create/create_workfile.py +++ b/client/ayon_core/hosts/fusion/plugins/create/create_workfile.py @@ -1,9 +1,9 @@ -from openpype.hosts.fusion.api import ( +from ayon_core.hosts.fusion.api import ( get_current_comp ) -from openpype import AYON_SERVER_ENABLED -from openpype.client import get_asset_by_name -from openpype.pipeline import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline import ( AutoCreator, CreatedInstance, ) diff --git a/client/ayon_core/hosts/fusion/plugins/inventory/select_containers.py b/client/ayon_core/hosts/fusion/plugins/inventory/select_containers.py index d554b73a5b..167cd3be1f 100644 --- a/client/ayon_core/hosts/fusion/plugins/inventory/select_containers.py +++ b/client/ayon_core/hosts/fusion/plugins/inventory/select_containers.py @@ -1,4 +1,4 @@ -from openpype.pipeline import InventoryAction +from ayon_core.pipeline import InventoryAction class FusionSelectContainers(InventoryAction): @@ -8,7 +8,7 @@ class FusionSelectContainers(InventoryAction): color = "#d8d8d8" def process(self, containers): - from openpype.hosts.fusion.api import ( + from ayon_core.hosts.fusion.api import ( get_current_comp, comp_lock_and_undo_chunk ) diff --git a/client/ayon_core/hosts/fusion/plugins/inventory/set_tool_color.py b/client/ayon_core/hosts/fusion/plugins/inventory/set_tool_color.py index a057ad1e89..7167cf0fc5 100644 --- a/client/ayon_core/hosts/fusion/plugins/inventory/set_tool_color.py +++ b/client/ayon_core/hosts/fusion/plugins/inventory/set_tool_color.py @@ -1,8 +1,8 @@ from qtpy import QtGui, QtWidgets -from openpype.pipeline import InventoryAction -from openpype import style -from openpype.hosts.fusion.api import ( +from ayon_core.pipeline import InventoryAction +from ayon_core import style +from ayon_core.hosts.fusion.api import ( get_current_comp, comp_lock_and_undo_chunk ) diff --git a/client/ayon_core/hosts/fusion/plugins/load/actions.py b/client/ayon_core/hosts/fusion/plugins/load/actions.py index 94ba361b50..f67878bcff 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/actions.py +++ b/client/ayon_core/hosts/fusion/plugins/load/actions.py @@ -2,7 +2,7 @@ """ -from openpype.pipeline import load +from ayon_core.pipeline import load class FusionSetFrameRangeLoader(load.LoaderPlugin): @@ -25,7 +25,7 @@ class FusionSetFrameRangeLoader(load.LoaderPlugin): def load(self, context, name, namespace, data): - from openpype.hosts.fusion.api import lib + from ayon_core.hosts.fusion.api import lib version = context['version'] version_data = version.get("data", {}) @@ -60,7 +60,7 @@ class FusionSetFrameRangeWithHandlesLoader(load.LoaderPlugin): def load(self, context, name, namespace, data): - from openpype.hosts.fusion.api import lib + from ayon_core.hosts.fusion.api import lib version = context['version'] version_data = version.get("data", {}) diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_alembic.py b/client/ayon_core/hosts/fusion/plugins/load/load_alembic.py index 9b6d1e12b4..0bc7ffd180 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/load_alembic.py +++ b/client/ayon_core/hosts/fusion/plugins/load/load_alembic.py @@ -1,8 +1,8 @@ -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.fusion.api import ( +from ayon_core.hosts.fusion.api import ( imprint_container, get_current_comp, comp_lock_and_undo_chunk diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_fbx.py b/client/ayon_core/hosts/fusion/plugins/load/load_fbx.py index d15d2c33d7..3751d7cc39 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/load_fbx.py +++ b/client/ayon_core/hosts/fusion/plugins/load/load_fbx.py @@ -1,8 +1,8 @@ -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.fusion.api import ( +from ayon_core.hosts.fusion.api import ( imprint_container, get_current_comp, comp_lock_and_undo_chunk, diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_sequence.py b/client/ayon_core/hosts/fusion/plugins/load/load_sequence.py index 4401af97eb..5c183f5159 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/load_sequence.py +++ b/client/ayon_core/hosts/fusion/plugins/load/load_sequence.py @@ -1,13 +1,13 @@ import contextlib -import openpype.pipeline.load as load -from openpype.pipeline.load import get_representation_context -from openpype.hosts.fusion.api import ( +import ayon_core.pipeline.load as load +from ayon_core.pipeline.load import get_representation_context +from ayon_core.hosts.fusion.api import ( imprint_container, get_current_comp, comp_lock_and_undo_chunk, ) -from openpype.lib.transcoding import IMAGE_EXTENSIONS, VIDEO_EXTENSIONS +from ayon_core.lib.transcoding import IMAGE_EXTENSIONS, VIDEO_EXTENSIONS comp = get_current_comp() diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_usd.py b/client/ayon_core/hosts/fusion/plugins/load/load_usd.py index 4f1813a646..9c61894d66 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/load_usd.py +++ b/client/ayon_core/hosts/fusion/plugins/load/load_usd.py @@ -1,13 +1,13 @@ -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.fusion.api import ( +from ayon_core.hosts.fusion.api import ( imprint_container, get_current_comp, comp_lock_and_undo_chunk ) -from openpype.hosts.fusion.api.lib import get_fusion_module +from ayon_core.hosts.fusion.api.lib import get_fusion_module class FusionLoadUSD(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_workfile.py b/client/ayon_core/hosts/fusion/plugins/load/load_workfile.py index 14e36ca8fd..d50fded502 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/load_workfile.py +++ b/client/ayon_core/hosts/fusion/plugins/load/load_workfile.py @@ -3,9 +3,9 @@ As all imported nodes are free floating and will probably be changed there is no update or reload function added for this plugin """ -from openpype.pipeline import load +from ayon_core.pipeline import load -from openpype.hosts.fusion.api import ( +from ayon_core.hosts.fusion.api import ( get_current_comp, get_bmd_library, ) diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_comp.py b/client/ayon_core/hosts/fusion/plugins/publish/collect_comp.py index d1c49790fa..591c460d5a 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/collect_comp.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/collect_comp.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.hosts.fusion.api import get_current_comp +from ayon_core.hosts.fusion.api import get_current_comp class CollectCurrentCompFusion(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_inputs.py b/client/ayon_core/hosts/fusion/plugins/publish/collect_inputs.py index f23e4d0268..002c0a5672 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/collect_inputs.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/collect_inputs.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline import registered_host +from ayon_core.pipeline import registered_host def collect_input_containers(tools): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py b/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py index 366eaa905c..f8870da1c5 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py @@ -2,9 +2,9 @@ import os import attr import pyblish.api -from openpype.pipeline import publish -from openpype.pipeline.publish import RenderInstance -from openpype.hosts.fusion.api.lib import get_frame_path +from ayon_core.pipeline import publish +from ayon_core.pipeline.publish import RenderInstance +from ayon_core.hosts.fusion.api.lib import get_frame_path @attr.s diff --git a/client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py b/client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py index 068df22c06..eea232ac29 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py @@ -4,9 +4,9 @@ import contextlib import collections import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.fusion.api import comp_lock_and_undo_chunk -from openpype.hosts.fusion.api.lib import get_frame_path, maintained_comp_range +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 log = logging.getLogger(__name__) diff --git a/client/ayon_core/hosts/fusion/plugins/publish/increment_current_file.py b/client/ayon_core/hosts/fusion/plugins/publish/increment_current_file.py index 08a65bf52d..bcff27b988 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/increment_current_file.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/increment_current_file.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype.pipeline import OptionalPyblishPluginMixin -from openpype.pipeline import KnownPublishError +from ayon_core.pipeline import OptionalPyblishPluginMixin +from ayon_core.pipeline import KnownPublishError class FusionIncrementCurrentFile( @@ -22,8 +22,8 @@ class FusionIncrementCurrentFile( if not self.is_active(context.data): return - from openpype.lib import version_up - from openpype.pipeline.publish import get_errored_plugins_from_context + from ayon_core.lib import version_up + from ayon_core.pipeline.publish import get_errored_plugins_from_context errored_plugins = get_errored_plugins_from_context(context) if any( diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_background_depth.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_background_depth.py index e268f8adec..d588748cfa 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_background_depth.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_background_depth.py @@ -1,12 +1,12 @@ import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( publish, OptionalPyblishPluginMixin, PublishValidationError, ) -from openpype.hosts.fusion.api.action import SelectInvalidAction +from ayon_core.hosts.fusion.api.action import SelectInvalidAction class ValidateBackgroundDepth( diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_comp_saved.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_comp_saved.py index 6e6d10e09a..ba56c40b65 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_comp_saved.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_comp_saved.py @@ -1,7 +1,7 @@ import os import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateFusionCompSaved(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_create_folder_checked.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_create_folder_checked.py index d5c618af58..13ea85b48c 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_create_folder_checked.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_create_folder_checked.py @@ -1,9 +1,9 @@ import pyblish.api -from openpype.pipeline.publish import RepairAction -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline.publish import RepairAction +from ayon_core.pipeline import PublishValidationError -from openpype.hosts.fusion.api.action import SelectInvalidAction +from ayon_core.hosts.fusion.api.action import SelectInvalidAction class ValidateCreateFolderChecked(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_expected_frames_existence.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_expected_frames_existence.py index 3f84f59678..83d1feaefd 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_expected_frames_existence.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_expected_frames_existence.py @@ -1,10 +1,10 @@ import os import pyblish.api -from openpype.pipeline.publish import RepairAction -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline.publish import RepairAction +from ayon_core.pipeline import PublishValidationError -from openpype.hosts.fusion.api.action import SelectInvalidAction +from ayon_core.hosts.fusion.api.action import SelectInvalidAction class ValidateLocalFramesExistence(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_filename_has_extension.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_filename_has_extension.py index 38cd578ff2..17b1aa47c8 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_filename_has_extension.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_filename_has_extension.py @@ -1,9 +1,9 @@ import os import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError -from openpype.hosts.fusion.api.action import SelectInvalidAction +from ayon_core.hosts.fusion.api.action import SelectInvalidAction class ValidateFilenameHasExtension(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_image_frame.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_image_frame.py index 734203f31c..70e5ed9279 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_image_frame.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_image_frame.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateImageFrame(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_frame_range.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_frame_range.py index edf219e752..0f7ef1862d 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_frame_range.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_frame_range.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateInstanceFrameRange(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_has_input.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_has_input.py index 0103e990fb..a8977e4747 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_has_input.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_has_input.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError -from openpype.hosts.fusion.api.action import SelectInvalidAction +from ayon_core.hosts.fusion.api.action import SelectInvalidAction class ValidateSaverHasInput(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_passthrough.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_passthrough.py index 6019bee93a..acafe3308f 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_passthrough.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_passthrough.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError -from openpype.hosts.fusion.api.action import SelectInvalidAction +from ayon_core.hosts.fusion.api.action import SelectInvalidAction class ValidateSaverPassthrough(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_resolution.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_resolution.py index b28af3409d..af8d4f41fa 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_resolution.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_resolution.py @@ -1,11 +1,11 @@ import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin, ) -from openpype.hosts.fusion.api.action import SelectInvalidAction -from openpype.hosts.fusion.api import comp_lock_and_undo_chunk +from ayon_core.hosts.fusion.api.action import SelectInvalidAction +from ayon_core.hosts.fusion.api import comp_lock_and_undo_chunk class ValidateSaverResolution( diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py index d1693ef3dc..619b52077e 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py +++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py @@ -1,9 +1,9 @@ from collections import defaultdict import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError -from openpype.hosts.fusion.api.action import SelectInvalidAction +from ayon_core.hosts.fusion.api.action import SelectInvalidAction class ValidateUniqueSubsets(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/fusion/scripts/duplicate_with_inputs.py b/client/ayon_core/hosts/fusion/scripts/duplicate_with_inputs.py index 21da6c24d8..727fd335ea 100644 --- a/client/ayon_core/hosts/fusion/scripts/duplicate_with_inputs.py +++ b/client/ayon_core/hosts/fusion/scripts/duplicate_with_inputs.py @@ -1,4 +1,4 @@ -from openpype.hosts.fusion.api import ( +from ayon_core.hosts.fusion.api import ( comp_lock_and_undo_chunk, get_current_comp ) diff --git a/client/ayon_core/hosts/harmony/addon.py b/client/ayon_core/hosts/harmony/addon.py index efef40ab92..172a1f104f 100644 --- a/client/ayon_core/hosts/harmony/addon.py +++ b/client/ayon_core/hosts/harmony/addon.py @@ -1,5 +1,5 @@ import os -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon HARMONY_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/harmony/api/README.md b/client/ayon_core/hosts/harmony/api/README.md index be3920fe29..cdc17b2285 100644 --- a/client/ayon_core/hosts/harmony/api/README.md +++ b/client/ayon_core/hosts/harmony/api/README.md @@ -5,7 +5,7 @@ The easiest way to setup for using Toon Boom Harmony is to use the built-in launch: ``` -python -c "import openpype.hosts.harmony.api as harmony;harmony.launch("path/to/harmony/executable")" +python -c "import ayon_core.hosts.harmony.api as harmony;harmony.launch("path/to/harmony/executable")" ``` Communication with Harmony happens with a server/client relationship where the server is in the Python process and the client is in the Harmony process. Messages between Python and Harmony are required to be dictionaries, which are serialized to strings: @@ -59,7 +59,7 @@ You can show the Workfiles app when Harmony launches by setting environment vari ### Low level messaging To send from Python to Harmony you can use the exposed method: ```python -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony from uuid import uuid4 @@ -75,7 +75,7 @@ print(harmony.send({"function": func, "args": ["Python"]})["result"]) To send a function with multiple arguments its best to declare the arguments within the function: ```python -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony from uuid import uuid4 signature = str(uuid4()).replace("-", "_") @@ -114,7 +114,7 @@ PypeHarmony.myAwesomeFunction = function() { Then you can call that javascript code from your Python like: ```Python -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony harmony.send({"function": "PypeHarmony.myAwesomeFunction"}); @@ -159,7 +159,7 @@ Now in python, just read all those files and send them to Harmony. ```python from pathlib import Path -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony path_to_js = Path('/path/to/my/js') script_to_send = "" @@ -178,7 +178,7 @@ harmony.send({"function": "Master.Boo.B"}) ### Scene Save Instead of sending a request to Harmony with `scene.saveAll` please use: ```python -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony harmony.save_scene() ``` @@ -195,7 +195,7 @@ These plugins were made with the [polly config](https://github.com/mindbender-st #### Creator Plugin ```python -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony from uuid import uuid4 @@ -212,7 +212,7 @@ class CreateComposite(harmony.Creator): The creator plugin can be configured to use other node types. For example here is a write node creator: ```python -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony class CreateRender(harmony.Creator): @@ -242,7 +242,7 @@ class CreateRender(harmony.Creator): #### Collector Plugin ```python import pyblish.api -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony class CollectInstances(pyblish.api.ContextPlugin): @@ -289,7 +289,7 @@ class CollectInstances(pyblish.api.ContextPlugin): import os import pyblish.api -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony import clique @@ -419,7 +419,7 @@ class ExtractImage(pyblish.api.InstancePlugin): ```python import os -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony signature = str(uuid4()).replace("-", "_") copy_files = """function copyFile(srcFilename, dstFilename) diff --git a/client/ayon_core/hosts/harmony/api/lib.py b/client/ayon_core/hosts/harmony/api/lib.py index b009dabb44..33fe26e558 100644 --- a/client/ayon_core/hosts/harmony/api/lib.py +++ b/client/ayon_core/hosts/harmony/api/lib.py @@ -19,10 +19,10 @@ import collections from .server import Server -from openpype.tools.stdout_broker.app import StdOutBroker -from openpype.tools.utils import host_tools -from openpype import style -from openpype.lib.applications import get_non_python_host_kwargs +from ayon_core.tools.stdout_broker.app import StdOutBroker +from ayon_core.tools.utils import host_tools +from ayon_core import style +from ayon_core.lib.applications import get_non_python_host_kwargs # Setup logging. log = logging.getLogger(__name__) @@ -183,8 +183,8 @@ def launch(application_path, *args): application_path (str): Path to Harmony. """ - from openpype.pipeline import install_host - from openpype.hosts.harmony import api as harmony + from ayon_core.pipeline import install_host + from ayon_core.hosts.harmony import api as harmony install_host(harmony) @@ -473,7 +473,7 @@ def imprint(node_id, data, remove=False): remove (bool): Removes the data from the scene. Example: - >>> from openpype.hosts.harmony.api import lib + >>> from ayon_core.hosts.harmony.api import lib >>> node = "Top/Display" >>> data = {"str": "something", "int": 1, "float": 0.32, "bool": True} >>> lib.imprint(layer, data) diff --git a/client/ayon_core/hosts/harmony/api/pipeline.py b/client/ayon_core/hosts/harmony/api/pipeline.py index 285ee806a1..c40e0ca721 100644 --- a/client/ayon_core/hosts/harmony/api/pipeline.py +++ b/client/ayon_core/hosts/harmony/api/pipeline.py @@ -4,19 +4,19 @@ import logging import pyblish.api -from openpype.lib import register_event_callback -from openpype.pipeline import ( +from ayon_core.lib import register_event_callback +from ayon_core.pipeline import ( register_loader_plugin_path, register_creator_plugin_path, deregister_loader_plugin_path, deregister_creator_plugin_path, AVALON_CONTAINER_ID, ) -from openpype.pipeline.load import get_outdated_containers -from openpype.pipeline.context_tools import get_current_project_asset +from ayon_core.pipeline.load import get_outdated_containers +from ayon_core.pipeline.context_tools import get_current_project_asset -from openpype.hosts.harmony import HARMONY_HOST_DIR -import openpype.hosts.harmony.api as harmony +from ayon_core.hosts.harmony import HARMONY_HOST_DIR +import ayon_core.hosts.harmony.api as harmony log = logging.getLogger("openpype.hosts.harmony") diff --git a/client/ayon_core/hosts/harmony/api/plugin.py b/client/ayon_core/hosts/harmony/api/plugin.py index c55d200d30..29ebdb2b8d 100644 --- a/client/ayon_core/hosts/harmony/api/plugin.py +++ b/client/ayon_core/hosts/harmony/api/plugin.py @@ -1,5 +1,5 @@ -from openpype.pipeline import LegacyCreator -import openpype.hosts.harmony.api as harmony +from ayon_core.pipeline import LegacyCreator +import ayon_core.hosts.harmony.api as harmony class Creator(LegacyCreator): diff --git a/client/ayon_core/hosts/harmony/plugins/create/create_farm_render.py b/client/ayon_core/hosts/harmony/plugins/create/create_farm_render.py index c62a90a9aa..6b19764181 100644 --- a/client/ayon_core/hosts/harmony/plugins/create/create_farm_render.py +++ b/client/ayon_core/hosts/harmony/plugins/create/create_farm_render.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Create Composite node for render on farm.""" -import openpype.hosts.harmony.api as harmony -from openpype.hosts.harmony.api import plugin +import ayon_core.hosts.harmony.api as harmony +from ayon_core.hosts.harmony.api import plugin class CreateFarmRender(plugin.Creator): diff --git a/client/ayon_core/hosts/harmony/plugins/create/create_render.py b/client/ayon_core/hosts/harmony/plugins/create/create_render.py index 4350efbfbe..0a2cd33551 100644 --- a/client/ayon_core/hosts/harmony/plugins/create/create_render.py +++ b/client/ayon_core/hosts/harmony/plugins/create/create_render.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Create render node.""" -import openpype.hosts.harmony.api as harmony -from openpype.hosts.harmony.api import plugin +import ayon_core.hosts.harmony.api as harmony +from ayon_core.hosts.harmony.api import plugin class CreateRender(plugin.Creator): diff --git a/client/ayon_core/hosts/harmony/plugins/create/create_template.py b/client/ayon_core/hosts/harmony/plugins/create/create_template.py index 534179b190..4f3fd85f00 100644 --- a/client/ayon_core/hosts/harmony/plugins/create/create_template.py +++ b/client/ayon_core/hosts/harmony/plugins/create/create_template.py @@ -1,4 +1,4 @@ -from openpype.hosts.harmony.api import plugin +from ayon_core.hosts.harmony.api import plugin class CreateTemplate(plugin.Creator): diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_audio.py b/client/ayon_core/hosts/harmony/plugins/load/load_audio.py index e18a6de097..14389166d7 100644 --- a/client/ayon_core/hosts/harmony/plugins/load/load_audio.py +++ b/client/ayon_core/hosts/harmony/plugins/load/load_audio.py @@ -1,8 +1,8 @@ -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony sig = harmony.signature() func = """ diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_background.py b/client/ayon_core/hosts/harmony/plugins/load/load_background.py index 853d347c2e..1c61cfa7a4 100644 --- a/client/ayon_core/hosts/harmony/plugins/load/load_background.py +++ b/client/ayon_core/hosts/harmony/plugins/load/load_background.py @@ -1,12 +1,12 @@ import os import json -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.pipeline.context_tools import is_representation_from_latest -import openpype.hosts.harmony.api as harmony +from ayon_core.pipeline.context_tools import is_representation_from_latest +import ayon_core.hosts.harmony.api as harmony copy_files = """function copyFile(srcFilename, dstFilename) diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_imagesequence.py b/client/ayon_core/hosts/harmony/plugins/load/load_imagesequence.py index 754f82e5d5..4d87272de8 100644 --- a/client/ayon_core/hosts/harmony/plugins/load/load_imagesequence.py +++ b/client/ayon_core/hosts/harmony/plugins/load/load_imagesequence.py @@ -6,12 +6,12 @@ from pathlib import Path import clique -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.pipeline.context_tools import is_representation_from_latest -import openpype.hosts.harmony.api as harmony +from ayon_core.pipeline.context_tools import is_representation_from_latest +import ayon_core.hosts.harmony.api as harmony class ImageSequenceLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_palette.py b/client/ayon_core/hosts/harmony/plugins/load/load_palette.py index 1da3e61e1b..aa5894e026 100644 --- a/client/ayon_core/hosts/harmony/plugins/load/load_palette.py +++ b/client/ayon_core/hosts/harmony/plugins/load/load_palette.py @@ -1,11 +1,11 @@ import os import shutil -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony class ImportPaletteLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_template.py b/client/ayon_core/hosts/harmony/plugins/load/load_template.py index a78a1bf1ec..d26f148c09 100644 --- a/client/ayon_core/hosts/harmony/plugins/load/load_template.py +++ b/client/ayon_core/hosts/harmony/plugins/load/load_template.py @@ -6,12 +6,12 @@ import os import shutil import uuid -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.pipeline.context_tools import is_representation_from_latest -import openpype.hosts.harmony.api as harmony +from ayon_core.pipeline.context_tools import is_representation_from_latest +import ayon_core.hosts.harmony.api as harmony class TemplateLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py b/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py index 2b84a43b35..0ea46f8f67 100644 --- a/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py +++ b/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py @@ -3,11 +3,11 @@ import zipfile import os import shutil -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony class ImportTemplateLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/collect_current_file.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_current_file.py index 736316fe3c..ebe123eacc 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/collect_current_file.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_current_file.py @@ -3,7 +3,7 @@ import os import pyblish.api -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony class CollectCurrentFile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py index af825c052a..faeff7bddd 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py @@ -4,10 +4,10 @@ from pathlib import Path import attr -from openpype.lib import get_formatted_current_time -from openpype.pipeline import publish -from openpype.pipeline.publish import RenderInstance -import openpype.hosts.harmony.api as harmony +from ayon_core.lib import get_formatted_current_time +from ayon_core.pipeline import publish +from ayon_core.pipeline.publish import RenderInstance +import ayon_core.hosts.harmony.api as harmony @attr.s diff --git a/client/ayon_core/hosts/harmony/plugins/publish/collect_instances.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_instances.py index edbec887f5..3eb689aff6 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/collect_instances.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_instances.py @@ -3,7 +3,7 @@ import json import pyblish.api -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony class CollectInstances(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/collect_palettes.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_palettes.py index e19057e302..9343fab86d 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/collect_palettes.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_palettes.py @@ -4,7 +4,7 @@ import json import re import pyblish.api -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony class CollectPalettes(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/collect_scene.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_scene.py index 3e65edf7d6..a60e44b69b 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/collect_scene.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_scene.py @@ -3,7 +3,7 @@ import os import pyblish.api -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony class CollectScene(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/collect_workfile.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_workfile.py index 4492ab37a5..4be2a0fc26 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/collect_workfile.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_workfile.py @@ -3,7 +3,7 @@ import os import pyblish.api -from openpype.pipeline.create import get_subset_name +from ayon_core.pipeline.create import get_subset_name class CollectWorkfile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/extract_palette.py b/client/ayon_core/hosts/harmony/plugins/publish/extract_palette.py index 69c6e098ff..9f12c78d9f 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/extract_palette.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/extract_palette.py @@ -5,8 +5,8 @@ import csv from PIL import Image, ImageDraw, ImageFont -import openpype.hosts.harmony.api as harmony -from openpype.pipeline import publish +import ayon_core.hosts.harmony.api as harmony +from ayon_core.pipeline import publish class ExtractPalette(publish.Extractor): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/extract_render.py b/client/ayon_core/hosts/harmony/plugins/publish/extract_render.py index 96a375716b..017228ac11 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/extract_render.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/extract_render.py @@ -3,8 +3,8 @@ import tempfile import subprocess import pyblish.api -import openpype.hosts.harmony.api as harmony -import openpype.lib +import ayon_core.hosts.harmony.api as harmony +import ayon_core.lib import clique diff --git a/client/ayon_core/hosts/harmony/plugins/publish/extract_save_scene.py b/client/ayon_core/hosts/harmony/plugins/publish/extract_save_scene.py index 9d37f51391..1be74ba3a4 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/extract_save_scene.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/extract_save_scene.py @@ -1,5 +1,5 @@ import pyblish.api -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony class ExtractSaveScene(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/extract_template.py b/client/ayon_core/hosts/harmony/plugins/publish/extract_template.py index e75459fe1e..c481a34454 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/extract_template.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/extract_template.py @@ -3,8 +3,8 @@ import os import shutil -from openpype.pipeline import publish -import openpype.hosts.harmony.api as harmony +from ayon_core.pipeline import publish +import ayon_core.hosts.harmony.api as harmony class ExtractTemplate(publish.Extractor): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/extract_workfile.py b/client/ayon_core/hosts/harmony/plugins/publish/extract_workfile.py index 9bb3090558..3081a57157 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/extract_workfile.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/extract_workfile.py @@ -4,7 +4,7 @@ import os import shutil from zipfile import ZipFile -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractWorkfile(publish.Extractor): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/increment_workfile.py b/client/ayon_core/hosts/harmony/plugins/publish/increment_workfile.py index 1caf581567..16332a5283 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/increment_workfile.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/increment_workfile.py @@ -1,9 +1,9 @@ import os import pyblish.api -from openpype.pipeline.publish import get_errored_plugins_from_context -from openpype.lib import version_up -import openpype.hosts.harmony.api as harmony +from ayon_core.pipeline.publish import get_errored_plugins_from_context +from ayon_core.lib import version_up +import ayon_core.hosts.harmony.api as harmony class IncrementWorkfile(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/validate_audio.py b/client/ayon_core/hosts/harmony/plugins/publish/validate_audio.py index e9b8609803..808734a061 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/validate_audio.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/validate_audio.py @@ -2,9 +2,9 @@ import os import pyblish.api -import openpype.hosts.harmony.api as harmony +import ayon_core.hosts.harmony.api as harmony -from openpype.pipeline import PublishXmlValidationError +from ayon_core.pipeline import PublishXmlValidationError class ValidateAudio(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/harmony/plugins/publish/validate_instances.py b/client/ayon_core/hosts/harmony/plugins/publish/validate_instances.py index 7183de6048..a57a863d6f 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/validate_instances.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/validate_instances.py @@ -1,8 +1,8 @@ import pyblish.api -import openpype.hosts.harmony.api as harmony -from openpype.pipeline import get_current_asset_name -from openpype.pipeline.publish import ( +import ayon_core.hosts.harmony.api as harmony +from ayon_core.pipeline import get_current_asset_name +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/harmony/plugins/publish/validate_scene_settings.py b/client/ayon_core/hosts/harmony/plugins/publish/validate_scene_settings.py index 866f12076a..0cf96e70b0 100644 --- a/client/ayon_core/hosts/harmony/plugins/publish/validate_scene_settings.py +++ b/client/ayon_core/hosts/harmony/plugins/publish/validate_scene_settings.py @@ -6,8 +6,8 @@ import re import pyblish.api -import openpype.hosts.harmony.api as harmony -from openpype.pipeline import PublishXmlValidationError +import ayon_core.hosts.harmony.api as harmony +from ayon_core.pipeline import PublishXmlValidationError class ValidateSceneSettingsRepair(pyblish.api.Action): diff --git a/client/ayon_core/hosts/hiero/addon.py b/client/ayon_core/hosts/hiero/addon.py index 1cc7a8637e..447700e2e1 100644 --- a/client/ayon_core/hosts/hiero/addon.py +++ b/client/ayon_core/hosts/hiero/addon.py @@ -1,6 +1,6 @@ import os import platform -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon HIERO_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/hiero/api/events.py b/client/ayon_core/hosts/hiero/api/events.py index 862a2607c1..0e509747d5 100644 --- a/client/ayon_core/hosts/hiero/api/events.py +++ b/client/ayon_core/hosts/hiero/api/events.py @@ -1,6 +1,6 @@ import os import hiero.core.events -from openpype.lib import Logger, register_event_callback +from ayon_core.lib import Logger, register_event_callback from .lib import ( sync_avalon_data_to_workfile, launch_workfiles_app, diff --git a/client/ayon_core/hosts/hiero/api/lib.py b/client/ayon_core/hosts/hiero/api/lib.py index bf719160d1..80aefd52af 100644 --- a/client/ayon_core/hosts/hiero/api/lib.py +++ b/client/ayon_core/hosts/hiero/api/lib.py @@ -20,18 +20,18 @@ try: except ImportError: from PySide2 import QtXml -from openpype.client import get_project -from openpype.settings import get_project_settings -from openpype.pipeline import Anatomy, get_current_project_name -from openpype.pipeline.load import filter_containers -from openpype.lib import Logger +from ayon_core.client import get_project +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import Anatomy, get_current_project_name +from ayon_core.pipeline.load import filter_containers +from ayon_core.lib import Logger from . import tags from .constants import ( OPENPYPE_TAG_NAME, DEFAULT_SEQUENCE_NAME, DEFAULT_BIN_NAME ) -from openpype.pipeline.colorspace import ( +from ayon_core.pipeline.colorspace import ( get_imageio_config ) @@ -795,7 +795,7 @@ class PublishAction(QtWidgets.QAction): # # ''' # import hiero.core -# from openpype.hosts.nuke.api.lib import ( +# from ayon_core.hosts.nuke.api.lib import ( # BuildWorkfile, # imprint # ) diff --git a/client/ayon_core/hosts/hiero/api/menu.py b/client/ayon_core/hosts/hiero/api/menu.py index ca611570cc..4e061edbf8 100644 --- a/client/ayon_core/hosts/hiero/api/menu.py +++ b/client/ayon_core/hosts/hiero/api/menu.py @@ -6,10 +6,10 @@ from hiero.ui import findMenuAction from qtpy import QtGui -from openpype.lib import Logger -from openpype.tools.utils import host_tools -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core.lib import Logger +from ayon_core.tools.utils import host_tools +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( get_current_project_name, get_current_asset_name, get_current_task_name diff --git a/client/ayon_core/hosts/hiero/api/pipeline.py b/client/ayon_core/hosts/hiero/api/pipeline.py index d88aeac810..7d5c98b9e8 100644 --- a/client/ayon_core/hosts/hiero/api/pipeline.py +++ b/client/ayon_core/hosts/hiero/api/pipeline.py @@ -7,8 +7,8 @@ import contextlib from collections import OrderedDict from pyblish import api as pyblish -from openpype.lib import Logger -from openpype.pipeline import ( +from ayon_core.lib import Logger +from ayon_core.pipeline import ( schema, register_creator_plugin_path, register_loader_plugin_path, @@ -16,7 +16,7 @@ from openpype.pipeline import ( deregister_loader_plugin_path, AVALON_CONTAINER_ID, ) -from openpype.tools.utils import host_tools +from ayon_core.tools.utils import host_tools from . import lib, menu, events import hiero @@ -325,7 +325,7 @@ def on_pyblish_instance_toggled(instance, old_value, new_value): log.info("instance toggle: {}, old_value: {}, new_value:{} ".format( instance, old_value, new_value)) - from openpype.hosts.hiero.api import ( + from ayon_core.hosts.hiero.api import ( get_trackitem_openpype_tag, set_publish_attribute ) diff --git a/client/ayon_core/hosts/hiero/api/plugin.py b/client/ayon_core/hosts/hiero/api/plugin.py index b0c73e41fb..574865488f 100644 --- a/client/ayon_core/hosts/hiero/api/plugin.py +++ b/client/ayon_core/hosts/hiero/api/plugin.py @@ -8,10 +8,10 @@ import hiero from qtpy import QtWidgets, QtCore import qargparse -from openpype.settings import get_current_project_settings -from openpype.lib import Logger -from openpype.pipeline import LoaderPlugin, LegacyCreator -from openpype.pipeline.load import get_representation_path_from_context +from ayon_core.settings import get_current_project_settings +from ayon_core.lib import Logger +from ayon_core.pipeline import LoaderPlugin, LegacyCreator +from ayon_core.pipeline.load import get_representation_path_from_context from . import lib log = Logger.get_logger(__name__) @@ -612,7 +612,7 @@ class Creator(LegacyCreator): def __init__(self, *args, **kwargs): super(Creator, self).__init__(*args, **kwargs) - import openpype.hosts.hiero.api as phiero + import ayon_core.hosts.hiero.api as phiero self.presets = get_current_project_settings()[ "hiero"]["create"].get(self.__class__.__name__, {}) diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/Startup.py b/client/ayon_core/hosts/hiero/api/startup/Python/Startup/Startup.py index 2e638c2088..faa999eddf 100644 --- a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/Startup.py +++ b/client/ayon_core/hosts/hiero/api/startup/Python/Startup/Startup.py @@ -1,8 +1,8 @@ import traceback # activate hiero from pype -from openpype.pipeline import install_host -import openpype.hosts.hiero.api as phiero +from ayon_core.pipeline import install_host +import ayon_core.hosts.hiero.api as phiero install_host(phiero) try: @@ -15,5 +15,5 @@ except ImportError as e: else: # Setup integration - import openpype.hosts.hiero.api as phiero + import ayon_core.hosts.hiero.api as phiero phiero.lib.setup() diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportTask.py b/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportTask.py index e4ce2fe827..bd5048a832 100644 --- a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportTask.py +++ b/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportTask.py @@ -8,7 +8,7 @@ import hiero.core from hiero.core import util import opentimelineio as otio -from openpype.hosts.hiero.api.otio import hiero_export +from ayon_core.hosts.hiero.api.otio import hiero_export class OTIOExportTask(hiero.core.TaskBase): diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportUI.py b/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportUI.py index af5593e484..25aa8bb0cf 100644 --- a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportUI.py +++ b/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportUI.py @@ -22,7 +22,7 @@ except ImportError: FormLayout = QFormLayout # lint:ok -from openpype.hosts.hiero.api.otio import hiero_export +from ayon_core.hosts.hiero.api.otio import hiero_export class OTIOExportUI(hiero.ui.TaskUIBase): def __init__(self, preset): diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/otioimporter/__init__.py b/client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/otioimporter/__init__.py index 91be4d02aa..29507db975 100644 --- a/client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/otioimporter/__init__.py +++ b/client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/otioimporter/__init__.py @@ -9,7 +9,7 @@ import hiero.core import PySide2.QtWidgets as qw -from openpype.hosts.hiero.api.otio.hiero_import import load_otio +from ayon_core.hosts.hiero.api.otio.hiero_import import load_otio class OTIOProjectSelect(qw.QDialog): diff --git a/client/ayon_core/hosts/hiero/api/tags.py b/client/ayon_core/hosts/hiero/api/tags.py index 02d8205414..ad7c7e44a1 100644 --- a/client/ayon_core/hosts/hiero/api/tags.py +++ b/client/ayon_core/hosts/hiero/api/tags.py @@ -3,9 +3,9 @@ import re import os import hiero -from openpype.client import get_project, get_assets -from openpype.lib import Logger -from openpype.pipeline import get_current_project_name +from ayon_core.client import get_project, get_assets +from ayon_core.lib import Logger +from ayon_core.pipeline import get_current_project_name log = Logger.get_logger(__name__) diff --git a/client/ayon_core/hosts/hiero/api/workio.py b/client/ayon_core/hosts/hiero/api/workio.py index 040fd1435a..14d9439344 100644 --- a/client/ayon_core/hosts/hiero/api/workio.py +++ b/client/ayon_core/hosts/hiero/api/workio.py @@ -1,7 +1,7 @@ import os import hiero -from openpype.lib import Logger +from ayon_core.lib import Logger log = Logger.get_logger(__name__) diff --git a/client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py b/client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py index d0c81cffa2..ce84a9120e 100644 --- a/client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py +++ b/client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py @@ -1,6 +1,6 @@ from copy import deepcopy -import openpype.hosts.hiero.api as phiero -# from openpype.hosts.hiero.api import plugin, lib +import ayon_core.hosts.hiero.api as phiero +# from ayon_core.hosts.hiero.api import plugin, lib # reload(lib) # reload(plugin) # reload(phiero) diff --git a/client/ayon_core/hosts/hiero/plugins/load/load_clip.py b/client/ayon_core/hosts/hiero/plugins/load/load_clip.py index 05bd12d185..d77a28872f 100644 --- a/client/ayon_core/hosts/hiero/plugins/load/load_clip.py +++ b/client/ayon_core/hosts/hiero/plugins/load/load_clip.py @@ -1,16 +1,16 @@ -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, get_current_project_name, ) -from openpype.lib.transcoding import ( +from ayon_core.lib.transcoding import ( VIDEO_EXTENSIONS, IMAGE_EXTENSIONS ) -import openpype.hosts.hiero.api as phiero +import ayon_core.hosts.hiero.api as phiero class LoadClip(phiero.SequenceLoader): diff --git a/client/ayon_core/hosts/hiero/plugins/load/load_effects.py b/client/ayon_core/hosts/hiero/plugins/load/load_effects.py index 31147d013f..809080e87e 100644 --- a/client/ayon_core/hosts/hiero/plugins/load/load_effects.py +++ b/client/ayon_core/hosts/hiero/plugins/load/load_effects.py @@ -2,18 +2,18 @@ import json from collections import OrderedDict import six -from openpype.client import ( +from ayon_core.client import ( get_version_by_id ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( AVALON_CONTAINER_ID, load, get_representation_path, get_current_project_name ) -from openpype.hosts.hiero import api as phiero -from openpype.lib import Logger +from ayon_core.hosts.hiero import api as phiero +from ayon_core.lib import Logger class LoadEffects(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/hiero/plugins/publish/collect_frame_tag_instances.py b/client/ayon_core/hosts/hiero/plugins/publish/collect_frame_tag_instances.py index 79bf67b336..b981d89eef 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish/collect_frame_tag_instances.py +++ b/client/ayon_core/hosts/hiero/plugins/publish/collect_frame_tag_instances.py @@ -5,7 +5,7 @@ import json import pyblish.api -from openpype.client import get_asset_name_identifier +from ayon_core.client import get_asset_name_identifier class CollectFrameTagInstances(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py b/client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py index 7fb381ff7e..afff41fc74 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py +++ b/client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py @@ -1,9 +1,9 @@ -# from openpype import plugins +# from ayon_core import plugins import os import json import pyblish.api -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractClipEffects(publish.Extractor): diff --git a/client/ayon_core/hosts/hiero/plugins/publish/extract_frames.py b/client/ayon_core/hosts/hiero/plugins/publish/extract_frames.py index 803c338766..9ea3134d4c 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish/extract_frames.py +++ b/client/ayon_core/hosts/hiero/plugins/publish/extract_frames.py @@ -1,11 +1,11 @@ import os import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( get_oiio_tool_args, run_subprocess, ) -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractFrames(publish.Extractor): diff --git a/client/ayon_core/hosts/hiero/plugins/publish/extract_thumbnail.py b/client/ayon_core/hosts/hiero/plugins/publish/extract_thumbnail.py index 5ca79dc1dc..bcaf5308d9 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish/extract_thumbnail.py +++ b/client/ayon_core/hosts/hiero/plugins/publish/extract_thumbnail.py @@ -1,7 +1,7 @@ import os import pyblish.api -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractThumnail(publish.Extractor): diff --git a/client/ayon_core/hosts/hiero/plugins/publish/integrate_version_up_workfile.py b/client/ayon_core/hosts/hiero/plugins/publish/integrate_version_up_workfile.py index 6ccbe955f2..27a8bc2604 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish/integrate_version_up_workfile.py +++ b/client/ayon_core/hosts/hiero/plugins/publish/integrate_version_up_workfile.py @@ -1,6 +1,6 @@ from pyblish import api -from openpype.lib import version_up +from ayon_core.lib import version_up class IntegrateVersionUpWorkfile(api.ContextPlugin): diff --git a/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py b/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py index 590d7b7050..a7c6dfc693 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py +++ b/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py @@ -1,10 +1,10 @@ import pyblish -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline.editorial import is_overlapping_otio_ranges +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline.editorial import is_overlapping_otio_ranges -from openpype.hosts.hiero import api as phiero -from openpype.hosts.hiero.api.otio import hiero_export +from ayon_core.hosts.hiero import api as phiero +from ayon_core.hosts.hiero.api.otio import hiero_export import hiero # # developer reload modules diff --git a/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py b/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py index 8abb0885c6..867d79f2d0 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py +++ b/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py @@ -7,8 +7,8 @@ from qtpy.QtGui import QPixmap import hiero.ui -from openpype import AYON_SERVER_ENABLED -from openpype.hosts.hiero.api.otio import hiero_export +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.hosts.hiero.api.otio import hiero_export class PrecollectWorkfile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py b/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py index 37370497a5..ca937f4aa2 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py +++ b/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py @@ -1,6 +1,6 @@ from pyblish import api -from openpype.client import get_assets, get_asset_name_identifier +from ayon_core.client import get_assets, get_asset_name_identifier class CollectAssetBuilds(api.ContextPlugin): diff --git a/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/precollect_retime.py b/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/precollect_retime.py index 2f65a8bd4f..297ffa8001 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/precollect_retime.py +++ b/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/precollect_retime.py @@ -1,7 +1,7 @@ from pyblish import api import hiero import math -from openpype.hosts.hiero.api.otio.hiero_export import create_otio_time_range +from ayon_core.hosts.hiero.api.otio.hiero_export import create_otio_time_range class PrecollectRetime(api.InstancePlugin): """Calculate Retiming of selected track items.""" diff --git a/client/ayon_core/hosts/houdini/addon.py b/client/ayon_core/hosts/houdini/addon.py index 80856b0624..34d140db3c 100644 --- a/client/ayon_core/hosts/houdini/addon.py +++ b/client/ayon_core/hosts/houdini/addon.py @@ -1,5 +1,5 @@ import os -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon HOUDINI_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/houdini/api/action.py b/client/ayon_core/hosts/houdini/api/action.py index 77966d6d5c..a14296950b 100644 --- a/client/ayon_core/hosts/houdini/api/action.py +++ b/client/ayon_core/hosts/houdini/api/action.py @@ -1,7 +1,7 @@ import pyblish.api import hou -from openpype.pipeline.publish import get_errored_instances_from_context +from ayon_core.pipeline.publish import get_errored_instances_from_context class SelectInvalidAction(pyblish.api.Action): diff --git a/client/ayon_core/hosts/houdini/api/colorspace.py b/client/ayon_core/hosts/houdini/api/colorspace.py index cc40b9df1c..66581d6f20 100644 --- a/client/ayon_core/hosts/houdini/api/colorspace.py +++ b/client/ayon_core/hosts/houdini/api/colorspace.py @@ -1,7 +1,7 @@ import attr import hou -from openpype.hosts.houdini.api.lib import get_color_management_preferences -from openpype.pipeline.colorspace import get_display_view_colorspace_name +from ayon_core.hosts.houdini.api.lib import get_color_management_preferences +from ayon_core.pipeline.colorspace import get_display_view_colorspace_name @attr.s class LayerMetadata(object): diff --git a/client/ayon_core/hosts/houdini/api/creator_node_shelves.py b/client/ayon_core/hosts/houdini/api/creator_node_shelves.py index 14662dc419..5381760b38 100644 --- a/client/ayon_core/hosts/houdini/api/creator_node_shelves.py +++ b/client/ayon_core/hosts/houdini/api/creator_node_shelves.py @@ -12,10 +12,10 @@ import tempfile import logging import os -from openpype.client import get_asset_by_name -from openpype.pipeline import registered_host -from openpype.pipeline.create import CreateContext -from openpype.resources import get_openpype_icon_filepath +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline import registered_host +from ayon_core.pipeline.create import CreateContext +from ayon_core.resources import get_openpype_icon_filepath import hou import stateutils @@ -34,7 +34,7 @@ CATEGORY_GENERIC_TOOL = { CREATE_SCRIPT = """ -from openpype.hosts.houdini.api.creator_node_shelves import create_interactive +from ayon_core.hosts.houdini.api.creator_node_shelves import create_interactive create_interactive("{identifier}", **kwargs) """ @@ -146,7 +146,7 @@ def install(): This function is re-entrant and can be called again to reinstall and update the node definitions. For example during development it can be useful to call it manually: - >>> from openpype.hosts.houdini.api.creator_node_shelves import install + >>> from ayon_core.hosts.houdini.api.creator_node_shelves import install >>> install() Returns: diff --git a/client/ayon_core/hosts/houdini/api/lib.py b/client/ayon_core/hosts/houdini/api/lib.py index edd50f10c1..89763aec08 100644 --- a/client/ayon_core/hosts/houdini/api/lib.py +++ b/client/ayon_core/hosts/houdini/api/lib.py @@ -10,10 +10,10 @@ import json import six -from openpype.lib import StringTemplate -from openpype.client import get_project, get_asset_by_name -from openpype.settings import get_current_project_settings -from openpype.pipeline import ( +from ayon_core.lib import StringTemplate +from ayon_core.client import get_project, get_asset_by_name +from ayon_core.settings import get_current_project_settings +from ayon_core.pipeline import ( Anatomy, get_current_project_name, get_current_asset_name, @@ -21,11 +21,11 @@ from openpype.pipeline import ( get_current_context, get_current_host_name, ) -from openpype.pipeline.create import CreateContext -from openpype.pipeline.template_data import get_template_data -from openpype.pipeline.context_tools import get_current_project_asset -from openpype.widgets import popup -from openpype.tools.utils.host_tools import get_tool_by_name +from ayon_core.pipeline.create import CreateContext +from ayon_core.pipeline.template_data import get_template_data +from ayon_core.pipeline.context_tools import get_current_project_asset +from ayon_core.widgets import popup +from ayon_core.tools.utils.host_tools import get_tool_by_name import hou @@ -1045,7 +1045,7 @@ def add_self_publish_button(node): button_parm = hou.ButtonParmTemplate( "ayon_self_publish", "{} Publish".format(label), - script_callback="from openpype.hosts.houdini.api.lib import " + script_callback="from ayon_core.hosts.houdini.api.lib import " "self_publish; self_publish()", script_callback_language=hou.scriptLanguage.Python, join_with_next=True diff --git a/client/ayon_core/hosts/houdini/api/pipeline.py b/client/ayon_core/hosts/houdini/api/pipeline.py index d0f45c36b5..7292b8eaa2 100644 --- a/client/ayon_core/hosts/houdini/api/pipeline.py +++ b/client/ayon_core/hosts/houdini/api/pipeline.py @@ -6,21 +6,21 @@ import logging import hou # noqa -from openpype.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost +from ayon_core.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( register_creator_plugin_path, register_loader_plugin_path, register_inventory_action_path, AVALON_CONTAINER_ID, ) -from openpype.pipeline.load import any_outdated_containers -from openpype.hosts.houdini import HOUDINI_HOST_DIR -from openpype.hosts.houdini.api import lib, shelves, creator_node_shelves +from ayon_core.pipeline.load import any_outdated_containers +from ayon_core.hosts.houdini import HOUDINI_HOST_DIR +from ayon_core.hosts.houdini.api import lib, shelves, creator_node_shelves -from openpype.lib import ( +from ayon_core.lib import ( register_event_callback, emit_event, ) @@ -306,11 +306,11 @@ def _show_outdated_content_popup(): log.info("Skipping outdated content pop-up " "because Houdini window can't be found.") else: - from openpype.widgets import popup + from ayon_core.widgets import popup # Show outdated pop-up def _on_show_inventory(): - from openpype.tools.utils import host_tools + from ayon_core.tools.utils import host_tools host_tools.show_scene_inventory(parent=parent) dialog = popup.Popup(parent=parent) diff --git a/client/ayon_core/hosts/houdini/api/plugin.py b/client/ayon_core/hosts/houdini/api/plugin.py index e162d0e461..aefe3ee559 100644 --- a/client/ayon_core/hosts/houdini/api/plugin.py +++ b/client/ayon_core/hosts/houdini/api/plugin.py @@ -7,14 +7,14 @@ from abc import ( import six import hou -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import ( CreatorError, LegacyCreator, Creator as NewCreator, CreatedInstance ) -from openpype.lib import BoolDef +from ayon_core.lib import BoolDef from .lib import imprint, read, lsattr, add_self_publish_button diff --git a/client/ayon_core/hosts/houdini/api/shelves.py b/client/ayon_core/hosts/houdini/api/shelves.py index 5093a90988..05bcefaa99 100644 --- a/client/ayon_core/hosts/houdini/api/shelves.py +++ b/client/ayon_core/hosts/houdini/api/shelves.py @@ -3,10 +3,10 @@ import re import logging import platform -from openpype.settings import get_project_settings -from openpype.pipeline import get_current_project_name +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import get_current_project_name -from openpype.lib import StringTemplate +from ayon_core.lib import StringTemplate import hou diff --git a/client/ayon_core/hosts/houdini/api/usd.py b/client/ayon_core/hosts/houdini/api/usd.py index b935dfdf30..239122d4d0 100644 --- a/client/ayon_core/hosts/houdini/api/usd.py +++ b/client/ayon_core/hosts/houdini/api/usd.py @@ -5,10 +5,10 @@ import logging from qtpy import QtWidgets, QtCore, QtGui -from openpype import style -from openpype.client import get_asset_by_name -from openpype.pipeline import legacy_io -from openpype.tools.utils.assets_widget import SingleSelectAssetsWidget +from ayon_core import style +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline import legacy_io +from ayon_core.tools.utils.assets_widget import SingleSelectAssetsWidget from pxr import Sdf diff --git a/client/ayon_core/hosts/houdini/hooks/set_paths.py b/client/ayon_core/hosts/houdini/hooks/set_paths.py index b23659e23b..1f24a8dd7d 100644 --- a/client/ayon_core/hosts/houdini/hooks/set_paths.py +++ b/client/ayon_core/hosts/houdini/hooks/set_paths.py @@ -1,4 +1,4 @@ -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class SetPath(PreLaunchHook): diff --git a/client/ayon_core/hosts/houdini/plugins/create/convert_legacy.py b/client/ayon_core/hosts/houdini/plugins/create/convert_legacy.py index 86103e3369..6e503fba6b 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/convert_legacy.py +++ b/client/ayon_core/hosts/houdini/plugins/create/convert_legacy.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Converter for legacy Houdini subsets.""" -from openpype.pipeline.create.creator_plugins import SubsetConvertorPlugin -from openpype.hosts.houdini.api.lib import imprint +from ayon_core.pipeline.create.creator_plugins import SubsetConvertorPlugin +from ayon_core.hosts.houdini.api.lib import imprint class HoudiniLegacyConvertor(SubsetConvertorPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py b/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py index 8c8a5e9eed..b6661fe7e4 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator plugin for creating alembic camera subsets.""" -from openpype.hosts.houdini.api import plugin -from openpype.pipeline import CreatedInstance, CreatorError +from ayon_core.hosts.houdini.api import plugin +from ayon_core.pipeline import CreatedInstance, CreatorError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py index 437a14c723..f60f5bc42f 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator plugin for creating Arnold ASS files.""" -from openpype.hosts.houdini.api import plugin -from openpype.lib import BoolDef +from ayon_core.hosts.houdini.api import plugin +from ayon_core.lib import BoolDef class CreateArnoldAss(plugin.HoudiniCreator): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py index 85c4f0f5ff..590a92f56f 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py @@ -1,5 +1,5 @@ -from openpype.hosts.houdini.api import plugin -from openpype.lib import EnumDef, BoolDef +from ayon_core.hosts.houdini.api import plugin +from ayon_core.lib import EnumDef, BoolDef class CreateArnoldRop(plugin.HoudiniCreator): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py b/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py index 4140919202..135c889b3e 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- """Creator plugin for creating pointcache bgeo files.""" -from openpype.hosts.houdini.api import plugin -from openpype.pipeline import CreatedInstance, CreatorError +from ayon_core.hosts.houdini.api import plugin +from ayon_core.pipeline import CreatedInstance, CreatorError import hou -from openpype.lib import EnumDef, BoolDef +from ayon_core.lib import EnumDef, BoolDef class CreateBGEO(plugin.HoudiniCreator): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_composite.py b/client/ayon_core/hosts/houdini/plugins/create/create_composite.py index 52ea6fa054..b87e1fd5b1 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_composite.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_composite.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator plugin for creating composite sequences.""" -from openpype.hosts.houdini.api import plugin -from openpype.pipeline import CreatedInstance, CreatorError +from ayon_core.hosts.houdini.api import plugin +from ayon_core.pipeline import CreatedInstance, CreatorError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_hda.py b/client/ayon_core/hosts/houdini/plugins/create/create_hda.py index f670b55eb6..faddc11b0c 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_hda.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_hda.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- """Creator plugin for creating publishable Houdini Digital Assets.""" -from openpype.client import ( +from ayon_core.client import ( get_asset_by_name, get_subsets, ) -from openpype.hosts.houdini.api import plugin +from ayon_core.hosts.houdini.api import plugin import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py index 4e1360ca45..5211044fea 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """Creator plugin to create Karma ROP.""" -from openpype.hosts.houdini.api import plugin -from openpype.pipeline import CreatedInstance -from openpype.lib import BoolDef, EnumDef, NumberDef +from ayon_core.hosts.houdini.api import plugin +from ayon_core.pipeline import CreatedInstance +from ayon_core.lib import BoolDef, EnumDef, NumberDef class CreateKarmaROP(plugin.HoudiniCreator): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py index 7ea7d1042f..7f1da13d2e 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """Creator plugin for creating pointcache alembics.""" -from openpype.hosts.houdini.api import plugin -from openpype.pipeline import CreatedInstance -from openpype.lib import BoolDef +from ayon_core.hosts.houdini.api import plugin +from ayon_core.pipeline import CreatedInstance +from ayon_core.lib import BoolDef class CreateMantraIFD(plugin.HoudiniCreator): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py index 8ecfbea802..02252f35d1 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """Creator plugin to create Mantra ROP.""" -from openpype.hosts.houdini.api import plugin -from openpype.pipeline import CreatedInstance -from openpype.lib import EnumDef, BoolDef +from ayon_core.hosts.houdini.api import plugin +from ayon_core.pipeline import CreatedInstance +from ayon_core.lib import EnumDef, BoolDef class CreateMantraROP(plugin.HoudiniCreator): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py b/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py index 2d2f89cc48..07dcc17f25 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator plugin for creating pointcache alembics.""" -from openpype.hosts.houdini.api import plugin -from openpype.lib import BoolDef +from ayon_core.hosts.houdini.api import plugin +from ayon_core.lib import BoolDef import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py index e1577c92e9..fa42411a1c 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """Creator plugin for creating Redshift proxies.""" -from openpype.hosts.houdini.api import plugin +from ayon_core.hosts.houdini.api import plugin import hou -from openpype.lib import BoolDef +from ayon_core.lib import BoolDef class CreateRedshiftProxy(plugin.HoudiniCreator): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py index 9d1c7bc90d..8e88c690b9 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py @@ -2,8 +2,8 @@ """Creator plugin to create Redshift ROP.""" import hou # noqa -from openpype.hosts.houdini.api import plugin -from openpype.lib import EnumDef, BoolDef +from ayon_core.hosts.houdini.api import plugin +from ayon_core.lib import EnumDef, BoolDef class CreateRedshiftROP(plugin.HoudiniCreator): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_review.py b/client/ayon_core/hosts/houdini/plugins/create/create_review.py index 60c34a358b..c512a61105 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_review.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_review.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator plugin for creating openGL reviews.""" -from openpype.hosts.houdini.api import plugin -from openpype.lib import EnumDef, BoolDef, NumberDef +from ayon_core.hosts.houdini.api import plugin +from ayon_core.lib import EnumDef, BoolDef, NumberDef import os import hou @@ -134,7 +134,7 @@ class CreateReview(plugin.HoudiniCreator): def set_colorcorrect_to_default_view_space(self, instance_node): """Set ociocolorspace to the default output space.""" - from openpype.hosts.houdini.api.colorspace import get_default_display_view_colorspace # noqa + from ayon_core.hosts.houdini.api.colorspace import get_default_display_view_colorspace # noqa # set Color Correction parameter to OpenColorIO instance_node.setParms({"colorcorrect": 2}) diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py b/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py index d0985198bd..319be3568d 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator for Unreal Static Meshes.""" -from openpype.hosts.houdini.api import plugin -from openpype.lib import BoolDef, EnumDef +from ayon_core.hosts.houdini.api import plugin +from ayon_core.lib import BoolDef, EnumDef import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_usd.py b/client/ayon_core/hosts/houdini/plugins/create/create_usd.py index e05d254863..db9c77fffe 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_usd.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_usd.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator plugin for creating USDs.""" -from openpype.hosts.houdini.api import plugin -from openpype.pipeline import CreatedInstance +from ayon_core.hosts.houdini.api import plugin +from ayon_core.pipeline import CreatedInstance import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_usdrender.py b/client/ayon_core/hosts/houdini/plugins/create/create_usdrender.py index f78f0bed50..72a2d2fc7f 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_usdrender.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_usdrender.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator plugin for creating USD renders.""" -from openpype.hosts.houdini.api import plugin -from openpype.pipeline import CreatedInstance +from ayon_core.hosts.houdini.api import plugin +from ayon_core.pipeline import CreatedInstance class CreateUSDRender(plugin.HoudiniCreator): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py b/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py index 53df9dda68..507917b7a5 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """Creator plugin for creating VDB Caches.""" -from openpype.hosts.houdini.api import plugin -from openpype.pipeline import CreatedInstance -from openpype.lib import BoolDef +from ayon_core.hosts.houdini.api import plugin +from ayon_core.pipeline import CreatedInstance +from ayon_core.lib import BoolDef import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py index 272b57b548..609828e201 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py @@ -2,9 +2,9 @@ """Creator plugin to create VRay ROP.""" import hou -from openpype.hosts.houdini.api import plugin -from openpype.pipeline import CreatedInstance -from openpype.lib import EnumDef, BoolDef +from ayon_core.hosts.houdini.api import plugin +from ayon_core.pipeline import CreatedInstance +from ayon_core.lib import EnumDef, BoolDef class CreateVrayROP(plugin.HoudiniCreator): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_workfile.py b/client/ayon_core/hosts/houdini/plugins/create/create_workfile.py index 850f5c994e..0854763533 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_workfile.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_workfile.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- """Creator plugin for creating workfiles.""" -from openpype import AYON_SERVER_ENABLED -from openpype.hosts.houdini.api import plugin -from openpype.hosts.houdini.api.lib import read, imprint -from openpype.hosts.houdini.api.pipeline import CONTEXT_CONTAINER -from openpype.pipeline import CreatedInstance, AutoCreator -from openpype.client import get_asset_by_name +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.hosts.houdini.api import plugin +from ayon_core.hosts.houdini.api.lib import read, imprint +from ayon_core.hosts.houdini.api.pipeline import CONTEXT_CONTAINER +from ayon_core.pipeline import CreatedInstance, AutoCreator +from ayon_core.client import get_asset_by_name import hou diff --git a/client/ayon_core/hosts/houdini/plugins/inventory/set_camera_resolution.py b/client/ayon_core/hosts/houdini/plugins/inventory/set_camera_resolution.py index 18ececb019..dadb80469a 100644 --- a/client/ayon_core/hosts/houdini/plugins/inventory/set_camera_resolution.py +++ b/client/ayon_core/hosts/houdini/plugins/inventory/set_camera_resolution.py @@ -1,9 +1,9 @@ -from openpype.pipeline import InventoryAction -from openpype.hosts.houdini.api.lib import ( +from ayon_core.pipeline import InventoryAction +from ayon_core.hosts.houdini.api.lib import ( get_camera_from_container, set_camera_resolution ) -from openpype.pipeline.context_tools import get_current_project_asset +from ayon_core.pipeline.context_tools import get_current_project_asset class SetCameraResolution(InventoryAction): diff --git a/client/ayon_core/hosts/houdini/plugins/load/actions.py b/client/ayon_core/hosts/houdini/plugins/load/actions.py index 637be1513d..2cffa565b1 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/actions.py +++ b/client/ayon_core/hosts/houdini/plugins/load/actions.py @@ -2,7 +2,7 @@ """ -from openpype.pipeline import load +from ayon_core.pipeline import load class SetFrameRangeLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_alembic.py b/client/ayon_core/hosts/houdini/plugins/load/load_alembic.py index 48bd730ebe..6996b0d117 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_alembic.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_alembic.py @@ -1,9 +1,9 @@ import os -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.houdini.api import pipeline +from ayon_core.hosts.houdini.api import pipeline class AbcLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_alembic_archive.py b/client/ayon_core/hosts/houdini/plugins/load/load_alembic_archive.py index 3a577f72b4..cfe3b16ebb 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_alembic_archive.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_alembic_archive.py @@ -1,9 +1,9 @@ import os -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.houdini.api import pipeline +from ayon_core.hosts.houdini.api import pipeline class AbcArchiveLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_ass.py b/client/ayon_core/hosts/houdini/plugins/load/load_ass.py index 557d601677..6fbe315adb 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_ass.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_ass.py @@ -1,11 +1,11 @@ import os import re -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.houdini.api import pipeline +from ayon_core.hosts.houdini.api import pipeline class AssLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_bgeo.py b/client/ayon_core/hosts/houdini/plugins/load/load_bgeo.py index 489bf944ed..afcf82562c 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_bgeo.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_bgeo.py @@ -2,11 +2,11 @@ import os import re -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.houdini.api import pipeline +from ayon_core.hosts.houdini.api import pipeline class BgeoLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_camera.py b/client/ayon_core/hosts/houdini/plugins/load/load_camera.py index e16146a267..11826fb30d 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_camera.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_camera.py @@ -1,10 +1,10 @@ -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.houdini.api import pipeline +from ayon_core.hosts.houdini.api import pipeline -from openpype.hosts.houdini.api.lib import ( +from ayon_core.hosts.houdini.api.lib import ( set_camera_resolution, get_camera_from_container ) diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_fbx.py b/client/ayon_core/hosts/houdini/plugins/load/load_fbx.py index 894ac62b3e..cc1a746d93 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_fbx.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_fbx.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- """Fbx Loader for houdini. """ -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.houdini.api import pipeline +from ayon_core.hosts.houdini.api import pipeline class FbxLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_hda.py b/client/ayon_core/hosts/houdini/plugins/load/load_hda.py index 9630716253..288152f2bd 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_hda.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_hda.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- import os -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.houdini.api import pipeline +from ayon_core.hosts.houdini.api import pipeline class HdaLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_image.py b/client/ayon_core/hosts/houdini/plugins/load/load_image.py index cff2b74e52..20fe2f87ca 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_image.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_image.py @@ -1,11 +1,11 @@ import os -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, AVALON_CONTAINER_ID, ) -from openpype.hosts.houdini.api import lib, pipeline +from ayon_core.hosts.houdini.api import lib, pipeline import hou diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_redshift_proxy.py b/client/ayon_core/hosts/houdini/plugins/load/load_redshift_proxy.py index efd7c6d0ca..dd6e78b3bc 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_redshift_proxy.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_redshift_proxy.py @@ -1,11 +1,11 @@ import os import re -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.houdini.api import pipeline -from openpype.pipeline.load import LoadError +from ayon_core.hosts.houdini.api import pipeline +from ayon_core.pipeline.load import LoadError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_usd_layer.py b/client/ayon_core/hosts/houdini/plugins/load/load_usd_layer.py index 1528cf549f..2c37c24884 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_usd_layer.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_usd_layer.py @@ -1,9 +1,9 @@ -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, AVALON_CONTAINER_ID, ) -from openpype.hosts.houdini.api import lib +from ayon_core.hosts.houdini.api import lib class USDSublayerLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_usd_reference.py b/client/ayon_core/hosts/houdini/plugins/load/load_usd_reference.py index 8402ad072c..9396f00cce 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_usd_reference.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_usd_reference.py @@ -1,9 +1,9 @@ -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, AVALON_CONTAINER_ID, ) -from openpype.hosts.houdini.api import lib +from ayon_core.hosts.houdini.api import lib class USDReferenceLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_vdb.py b/client/ayon_core/hosts/houdini/plugins/load/load_vdb.py index bcc4f200d3..c3e374ee8d 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_vdb.py +++ b/client/ayon_core/hosts/houdini/plugins/load/load_vdb.py @@ -1,11 +1,11 @@ import os import re -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.houdini.api import pipeline +from ayon_core.hosts.houdini.api import pipeline class VdbLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/load/show_usdview.py b/client/ayon_core/hosts/houdini/plugins/load/show_usdview.py index d56c4acc4f..2f86f23b68 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/show_usdview.py +++ b/client/ayon_core/hosts/houdini/plugins/load/show_usdview.py @@ -2,8 +2,8 @@ import os import platform import subprocess -from openpype.lib.vendor_bin_utils import find_executable -from openpype.pipeline import load +from ayon_core.lib.vendor_bin_utils import find_executable +from ayon_core.pipeline import load class ShowInUsdview(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_arnold_rop.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_arnold_rop.py index ffc2a526a3..7fe38555a3 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_arnold_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_arnold_rop.py @@ -4,8 +4,8 @@ import re import hou import pyblish.api -from openpype.hosts.houdini.api import colorspace -from openpype.hosts.houdini.api.lib import ( +from ayon_core.hosts.houdini.api import colorspace +from ayon_core.hosts.houdini.api.lib import ( evalParmNoFrame, get_color_management_preferences) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_asset_handles.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_asset_handles.py index 67a281639d..f4425d9216 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_asset_handles.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_asset_handles.py @@ -2,8 +2,8 @@ """Collector plugin for frames data on ROP instances.""" import hou # noqa import pyblish.api -from openpype.lib import BoolDef -from openpype.pipeline import OpenPypePyblishPluginMixin +from ayon_core.lib import BoolDef +from ayon_core.pipeline import OpenPypePyblishPluginMixin class CollectAssetHandles(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py index 36ade32a35..f91c253c25 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py @@ -1,7 +1,7 @@ import os import pyblish.api import hou -from openpype.hosts.houdini.api import lib +from ayon_core.hosts.houdini.api import lib class CollectDataforCache(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py index f8cd4089e2..5a6b0b156c 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.lib import NumberDef -from openpype.pipeline import OpenPypePyblishPluginMixin +from ayon_core.lib import NumberDef +from ayon_core.pipeline import OpenPypePyblishPluginMixin class CollectChunkSize(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py index 089fae6b1b..a643ab0d38 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py @@ -5,7 +5,7 @@ import re import hou # noqa import pyblish.api -from openpype.hosts.houdini.api import lib +from ayon_core.hosts.houdini.api import lib class CollectFrames(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_inputs.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_inputs.py index e92a42f2e8..7d7fabb315 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_inputs.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_inputs.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline import registered_host +from ayon_core.pipeline import registered_host def collect_input_containers(nodes): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_instances.py index 52966fb3c2..2780da95d9 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_instances.py @@ -2,7 +2,7 @@ import hou import pyblish.api -from openpype.hosts.houdini.api import lib +from ayon_core.hosts.houdini.api import lib class CollectInstances(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py index d154cdc7c0..800d6fb883 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py @@ -1,8 +1,8 @@ import hou import pyblish.api -from openpype.hosts.houdini.api import lib -import openpype.hosts.houdini.api.usd as hou_usdlib -import openpype.lib.usdlib as usdlib +from ayon_core.hosts.houdini.api import lib +import ayon_core.hosts.houdini.api.usd as hou_usdlib +import ayon_core.lib.usdlib as usdlib class CollectInstancesUsdLayered(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_karma_rop.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_karma_rop.py index dac350a6ef..85100bc2c6 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_karma_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_karma_rop.py @@ -4,11 +4,11 @@ import os import hou import pyblish.api -from openpype.hosts.houdini.api.lib import ( +from ayon_core.hosts.houdini.api.lib import ( evalParmNoFrame, get_color_management_preferences ) -from openpype.hosts.houdini.api import ( +from ayon_core.hosts.houdini.api import ( colorspace ) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_mantra_rop.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_mantra_rop.py index 64ef20f4e7..d46476c2ce 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_mantra_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_mantra_rop.py @@ -4,11 +4,11 @@ import os import hou import pyblish.api -from openpype.hosts.houdini.api.lib import ( +from ayon_core.hosts.houdini.api.lib import ( evalParmNoFrame, get_color_management_preferences ) -from openpype.hosts.houdini.api import ( +from ayon_core.hosts.houdini.api import ( colorspace ) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_output_node.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_output_node.py index bca3d9fdc1..26381e065e 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_output_node.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_output_node.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import KnownPublishError +from ayon_core.pipeline.publish import KnownPublishError class CollectOutputSOPPath(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_redshift_rop.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_redshift_rop.py index aec7e07fbc..26dd942559 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_redshift_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_redshift_rop.py @@ -4,11 +4,11 @@ import os import hou import pyblish.api -from openpype.hosts.houdini.api.lib import ( +from ayon_core.hosts.houdini.api.lib import ( evalParmNoFrame, get_color_management_preferences ) -from openpype.hosts.houdini.api import ( +from ayon_core.hosts.houdini.api import ( colorspace ) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_remote_publish.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_remote_publish.py index d56d389be0..5d459f525e 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_remote_publish.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_remote_publish.py @@ -1,8 +1,8 @@ import pyblish.api import hou -from openpype.pipeline.publish import RepairAction -from openpype.hosts.houdini.api import lib +from ayon_core.pipeline.publish import RepairAction +from ayon_core.hosts.houdini.api import lib class CollectRemotePublishSettings(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_rop_frame_range.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_rop_frame_range.py index 1e6bc3b16e..44afaf2466 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_rop_frame_range.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_rop_frame_range.py @@ -2,7 +2,7 @@ """Collector plugin for frames data on ROP instances.""" import hou # noqa import pyblish.api -from openpype.hosts.houdini.api import lib +from ayon_core.hosts.houdini.api import lib class CollectRopFrameRange(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_bootstrap.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_bootstrap.py index 462cf99b9c..ed54ad8bc1 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_bootstrap.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_bootstrap.py @@ -1,11 +1,11 @@ import pyblish.api -from openpype.client import ( +from ayon_core.client import ( get_subset_by_name, get_asset_by_name, get_asset_name_identifier, ) -import openpype.lib.usdlib as usdlib +import ayon_core.lib.usdlib as usdlib class CollectUsdBootstrap(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py index 696560a590..e36cd875ba 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py @@ -1,7 +1,7 @@ import os import pyblish.api -import openpype.hosts.houdini.api.usd as usdlib +import ayon_core.hosts.houdini.api.usd as usdlib import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_vray_rop.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_vray_rop.py index ad4fdb0da5..f80ca39f1c 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_vray_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_vray_rop.py @@ -4,11 +4,11 @@ import os import hou import pyblish.api -from openpype.hosts.houdini.api.lib import ( +from ayon_core.hosts.houdini.api.lib import ( evalParmNoFrame, get_color_management_preferences ) -from openpype.hosts.houdini.api import ( +from ayon_core.hosts.houdini.api import ( colorspace ) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_alembic.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_alembic.py index df2fdda241..daf30b26ed 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_alembic.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_alembic.py @@ -2,8 +2,8 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.houdini.api.lib import render_rop +from ayon_core.pipeline import publish +from ayon_core.hosts.houdini.api.lib import render_rop import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_ass.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_ass.py index 28dd08f999..24b956ad81 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_ass.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_ass.py @@ -2,8 +2,8 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.houdini.api.lib import render_rop +from ayon_core.pipeline import publish +from ayon_core.hosts.houdini.api.lib import render_rop import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_bgeo.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_bgeo.py index a3840f8f73..448cf97848 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_bgeo.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_bgeo.py @@ -2,9 +2,9 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.houdini.api.lib import render_rop -from openpype.hosts.houdini.api import lib +from ayon_core.pipeline import publish +from ayon_core.hosts.houdini.api.lib import render_rop +from ayon_core.hosts.houdini.api import lib import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_composite.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_composite.py index 11cf83a46d..c6dfb4332d 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_composite.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_composite.py @@ -1,8 +1,8 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.houdini.api.lib import render_rop, splitext +from ayon_core.pipeline import publish +from ayon_core.hosts.houdini.api.lib import render_rop, splitext import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_fbx.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_fbx.py index 7dc193c6a9..7ef004d7cb 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_fbx.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_fbx.py @@ -3,8 +3,8 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.houdini.api.lib import render_rop +from ayon_core.pipeline import publish +from ayon_core.hosts.houdini.api.lib import render_rop import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_hda.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_hda.py index 8b97bf364f..5fe83e0dcf 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_hda.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_hda.py @@ -2,7 +2,7 @@ import os from pprint import pformat import pyblish.api -from openpype.pipeline import publish +from ayon_core.pipeline import publish import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_mantra_ifd.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_mantra_ifd.py index 894260d1bf..f0bcf4b371 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_mantra_ifd.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_mantra_ifd.py @@ -2,7 +2,7 @@ import os import pyblish.api -from openpype.pipeline import publish +from ayon_core.pipeline import publish import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_opengl.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_opengl.py index 38808089ac..fabdfd9a9d 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_opengl.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_opengl.py @@ -2,8 +2,8 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.houdini.api.lib import render_rop +from ayon_core.pipeline import publish +from ayon_core.hosts.houdini.api.lib import render_rop import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_redshift_proxy.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_redshift_proxy.py index 218f3b9256..e08a73ae8e 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_redshift_proxy.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_redshift_proxy.py @@ -2,8 +2,8 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.houdini.api.lib import render_rop +from ayon_core.pipeline import publish +from ayon_core.hosts.houdini.api.lib import render_rop import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_usd.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_usd.py index 61c1b477b2..0aeed06643 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_usd.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_usd.py @@ -2,8 +2,8 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.houdini.api.lib import render_rop +from ayon_core.pipeline import publish +from ayon_core.hosts.houdini.api.lib import render_rop import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_usd_layered.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_usd_layered.py index d6193f13c1..7160e3d282 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_usd_layered.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_usd_layered.py @@ -6,18 +6,18 @@ from collections import deque import pyblish.api -from openpype.client import ( +from ayon_core.client import ( get_asset_by_name, get_subset_by_name, get_last_version_by_subset_id, get_representation_by_name, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, publish, ) -import openpype.hosts.houdini.api.usd as hou_usdlib -from openpype.hosts.houdini.api.lib import render_rop +import ayon_core.hosts.houdini.api.usd as hou_usdlib +from ayon_core.hosts.houdini.api.lib import render_rop class ExitStack(object): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_vdb_cache.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_vdb_cache.py index 8ac16704f0..4544d33e57 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_vdb_cache.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_vdb_cache.py @@ -2,8 +2,8 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.houdini.api.lib import render_rop +from ayon_core.pipeline import publish +from ayon_core.hosts.houdini.api.lib import render_rop import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/increment_current_file.py b/client/ayon_core/hosts/houdini/plugins/publish/increment_current_file.py index 4788cca3cf..73145b211a 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/increment_current_file.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/increment_current_file.py @@ -1,10 +1,10 @@ import pyblish.api -from openpype.lib import version_up -from openpype.pipeline import registered_host -from openpype.pipeline.publish import get_errored_plugins_from_context -from openpype.hosts.houdini.api import HoudiniHost -from openpype.pipeline.publish import KnownPublishError +from ayon_core.lib import version_up +from ayon_core.pipeline import registered_host +from ayon_core.pipeline.publish import get_errored_plugins_from_context +from ayon_core.hosts.houdini.api import HoudiniHost +from ayon_core.pipeline.publish import KnownPublishError class IncrementCurrentFile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/save_scene.py b/client/ayon_core/hosts/houdini/plugins/publish/save_scene.py index 3ae3fa3220..7c453038ea 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/save_scene.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/save_scene.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline import registered_host +from ayon_core.pipeline import registered_host class SaveCurrentScene(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_abc_primitive_to_detail.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_abc_primitive_to_detail.py index af9e080466..18a459bf7b 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_abc_primitive_to_detail.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_abc_primitive_to_detail.py @@ -2,7 +2,7 @@ import pyblish.api from collections import defaultdict -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateAbcPrimitiveToDetail(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_alembic_input_node.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_alembic_input_node.py index 47c47e4ea2..dbc38058e6 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_alembic_input_node.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_alembic_input_node.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_animation_settings.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_animation_settings.py index 79387fbef5..e28c38ece0 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_animation_settings.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_animation_settings.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype.pipeline.publish import PublishValidationError -from openpype.hosts.houdini.api import lib +from ayon_core.pipeline.publish import PublishValidationError +from ayon_core.hosts.houdini.api import lib import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_bypass.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_bypass.py index c10c5a2c05..8a83ff42fb 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_bypass.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_bypass.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_camera_rop.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_camera_rop.py index 41b5273e6a..ad4ace988a 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_camera_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_camera_rop.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Validator plugin for Houdini Camera ROP settings.""" import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateCameraROP(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_cop_output_node.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_cop_output_node.py index 1fc767b309..95414ae7f1 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_cop_output_node.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_cop_output_node.py @@ -3,7 +3,7 @@ import sys import pyblish.api import six -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateCopOutputNode(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_fbx_output_node.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_fbx_output_node.py index 894dad7d72..08eaa182c0 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_fbx_output_node.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_fbx_output_node.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError -from openpype.hosts.houdini.api.action import ( +from ayon_core.pipeline import PublishValidationError +from ayon_core.hosts.houdini.api.action import ( SelectInvalidAction, SelectROPAction, ) -from openpype.hosts.houdini.api.lib import get_obj_node_output +from ayon_core.hosts.houdini.api.lib import get_obj_node_output import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_file_extension.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_file_extension.py index 6594d10851..1134f8853a 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_file_extension.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_file_extension.py @@ -2,8 +2,8 @@ import os import pyblish.api -from openpype.hosts.houdini.api import lib -from openpype.pipeline import PublishValidationError +from ayon_core.hosts.houdini.api import lib +from ayon_core.pipeline import PublishValidationError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_range.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_range.py index 1b12fa7096..36e1b9b2a5 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_range.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_range.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError -from openpype.pipeline.publish import RepairAction -from openpype.hosts.houdini.api.action import SelectInvalidAction +from ayon_core.pipeline import PublishValidationError +from ayon_core.pipeline.publish import RepairAction +from ayon_core.hosts.houdini.api.action import SelectInvalidAction import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_token.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_token.py index 06d4003295..20fb859146 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_token.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_token.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.hosts.houdini.api import lib +from ayon_core.hosts.houdini.api import lib import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_houdini_license_category.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_houdini_license_category.py index 108a700bbe..0df858ca4b 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_houdini_license_category.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_houdini_license_category.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_mesh_is_static.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_mesh_is_static.py index b499682e0b..289e00339b 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_mesh_is_static.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_mesh_is_static.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- """Validator for correct naming of Static Meshes.""" import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin ) -from openpype.pipeline.publish import ValidateContentsOrder +from ayon_core.pipeline.publish import ValidateContentsOrder -from openpype.hosts.houdini.api.action import SelectInvalidAction -from openpype.hosts.houdini.api.lib import get_output_children +from ayon_core.hosts.houdini.api.action import SelectInvalidAction +from ayon_core.hosts.houdini.api.lib import get_output_children class ValidateMeshIsStatic(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_mkpaths_toggled.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_mkpaths_toggled.py index 9d1f92a101..38f1c4e176 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_mkpaths_toggled.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_mkpaths_toggled.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateIntermediateDirectoriesChecked(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_no_errors.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_no_errors.py index 6c48eae70a..ae1e5cad27 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_no_errors.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_no_errors.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import pyblish.api import hou -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError def cook_in_range(node, start, end): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_primitive_hierarchy_paths.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_primitive_hierarchy_paths.py index 471fa5b6d1..f63cb23138 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_primitive_hierarchy_paths.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_primitive_hierarchy_paths.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError -from openpype.pipeline.publish import ( +from ayon_core.pipeline import PublishValidationError +from ayon_core.pipeline.publish import ( ValidateContentsOrder, RepairAction, ) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish.py index 4f71d79382..133b45e8c3 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish.py @@ -1,9 +1,9 @@ # -*-coding: utf-8 -*- import pyblish.api -from openpype.hosts.houdini.api import lib -from openpype.pipeline.publish import RepairContextAction -from openpype.pipeline import PublishValidationError +from ayon_core.hosts.houdini.api import lib +from ayon_core.pipeline.publish import RepairContextAction +from ayon_core.pipeline import PublishValidationError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish_enabled.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish_enabled.py index 8ec62f4e85..d4c6e7a45e 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish_enabled.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish_enabled.py @@ -2,8 +2,8 @@ import pyblish.api import hou -from openpype.pipeline.publish import RepairContextAction -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline.publish import RepairContextAction +from ayon_core.pipeline import PublishValidationError class ValidateRemotePublishEnabled(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_review_colorspace.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_review_colorspace.py index 03ecd1b052..031138e21d 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_review_colorspace.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_review_colorspace.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin ) -from openpype.pipeline.publish import RepairAction -from openpype.hosts.houdini.api.action import SelectROPAction +from ayon_core.pipeline.publish import RepairAction +from ayon_core.hosts.houdini.api.action import SelectROPAction import os import hou @@ -68,7 +68,7 @@ class ValidateReviewColorspace(pyblish.api.InstancePlugin, It is a helper action more than a repair action, used to set colorspace on opengl node to the default view. """ - from openpype.hosts.houdini.api.colorspace import get_default_display_view_colorspace # noqa + from ayon_core.hosts.houdini.api.colorspace import get_default_display_view_colorspace # noqa rop_node = hou.node(instance.data["instance_node"]) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_scene_review.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_scene_review.py index a44b7e1597..b6007d3f0f 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_scene_review.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_scene_review.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_sop_output_node.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_sop_output_node.py index 9590e37d26..61cf7596ac 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_sop_output_node.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_sop_output_node.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError -from openpype.hosts.houdini.api.action import ( +from ayon_core.pipeline import PublishValidationError +from ayon_core.hosts.houdini.api.action import ( SelectInvalidAction, SelectROPAction, ) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_subset_name.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_subset_name.py index 7bed74ebb1..67807b5366 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_subset_name.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_subset_name.py @@ -1,16 +1,16 @@ # -*- coding: utf-8 -*- """Validator for correct naming of Static Meshes.""" import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin ) -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, RepairAction, ) -from openpype.hosts.houdini.api.action import SelectInvalidAction -from openpype.pipeline.create import get_subset_name +from ayon_core.hosts.houdini.api.action import SelectInvalidAction +from ayon_core.pipeline.create import get_subset_name import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_unreal_staticmesh_naming.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_unreal_staticmesh_naming.py index ae3c7e5602..dbee293074 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_unreal_staticmesh_naming.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_unreal_staticmesh_naming.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- """Validator for correct naming of Static Meshes.""" import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin ) -from openpype.pipeline.publish import ValidateContentsOrder +from ayon_core.pipeline.publish import ValidateContentsOrder -from openpype.hosts.houdini.api.action import SelectInvalidAction -from openpype.hosts.houdini.api.lib import get_output_children +from ayon_core.hosts.houdini.api.action import SelectInvalidAction +from ayon_core.hosts.houdini.api.lib import get_output_children import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_layer_path_backslashes.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_layer_path_backslashes.py index f2c7878c4e..2b727670ad 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_layer_path_backslashes.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_layer_path_backslashes.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import pyblish.api -import openpype.hosts.houdini.api.usd as hou_usdlib -from openpype.pipeline import PublishValidationError +import ayon_core.hosts.houdini.api.usd as hou_usdlib +from ayon_core.pipeline import PublishValidationError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_model_and_shade.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_model_and_shade.py index b8faae16d7..dc1a19cae0 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_model_and_shade.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_model_and_shade.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import pyblish.api -import openpype.hosts.houdini.api.usd as hou_usdlib -from openpype.pipeline import PublishValidationError +import ayon_core.hosts.houdini.api.usd as hou_usdlib +from ayon_core.pipeline import PublishValidationError from pxr import UsdShade, UsdRender, UsdLux diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_output_node.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_output_node.py index 5cb5bd35fb..968d64e8fc 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_output_node.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_output_node.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateUSDOutputNode(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_render_product_names.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_render_product_names.py index 1daa96f2b9..4825b7cc71 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_render_product_names.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_render_product_names.py @@ -2,7 +2,7 @@ import os import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateUSDRenderProductNames(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_setdress.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_setdress.py index b96d185482..40b67e896a 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_setdress.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_setdress.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import pyblish.api -import openpype.hosts.houdini.api.usd as hou_usdlib -from openpype.pipeline import PublishValidationError +import ayon_core.hosts.houdini.api.usd as hou_usdlib +from ayon_core.pipeline import PublishValidationError class ValidateUsdSetDress(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py index 0db782d545..8fa20ace02 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py @@ -3,9 +3,9 @@ import re import pyblish.api -from openpype.client import get_subset_by_name -from openpype.pipeline.publish import ValidateContentsOrder -from openpype.pipeline import PublishValidationError +from ayon_core.client import get_subset_by_name +from ayon_core.pipeline.publish import ValidateContentsOrder +from ayon_core.pipeline import PublishValidationError class ValidateUSDShadeModelExists(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_workspace.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_workspace.py index cb2099437d..d85f20e3ce 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_workspace.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_workspace.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_vdb_output_node.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_vdb_output_node.py index b51e1007f0..319a9a4b50 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_vdb_output_node.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_vdb_output_node.py @@ -4,8 +4,8 @@ import contextlib import pyblish.api import hou -from openpype.pipeline import PublishXmlValidationError -from openpype.hosts.houdini.api.action import SelectInvalidAction +from ayon_core.pipeline import PublishXmlValidationError +from ayon_core.hosts.houdini.api.action import SelectInvalidAction def group_consecutive_numbers(nums): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_workfile_paths.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_workfile_paths.py index afe05e3173..7984b7615c 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_workfile_paths.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_workfile_paths.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- import pyblish.api import hou -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin ) -from openpype.pipeline.publish import RepairAction +from ayon_core.pipeline.publish import RepairAction class ValidateWorkfilePaths( diff --git a/client/ayon_core/hosts/houdini/startup/MainMenuCommon.xml b/client/ayon_core/hosts/houdini/startup/MainMenuCommon.xml index 0903aef7bc..060a382164 100644 --- a/client/ayon_core/hosts/houdini/startup/MainMenuCommon.xml +++ b/client/ayon_core/hosts/houdini/startup/MainMenuCommon.xml @@ -8,7 +8,7 @@ return os.environ.get("AVALON_LABEL") or "AYON" ]]> @@ -20,7 +20,7 @@ return label @@ -30,7 +30,7 @@ host_tools.show_publisher(parent, tab="create") @@ -40,7 +40,7 @@ host_tools.show_loader(parent=parent, use_context=True) @@ -50,7 +50,7 @@ host_tools.show_publisher(parent, tab="publish") @@ -60,7 +60,7 @@ host_tools.show_scene_inventory(parent) @@ -72,7 +72,7 @@ host_tools.show_library_loader(parent=parent) @@ -81,7 +81,7 @@ host_tools.show_workfiles(parent) @@ -89,7 +89,7 @@ openpype.hosts.houdini.api.lib.reset_framerange() @@ -99,7 +99,7 @@ openpype.hosts.houdini.api.lib.update_houdini_vars_context_dialog() diff --git a/client/ayon_core/hosts/houdini/startup/python2.7libs/pythonrc.py b/client/ayon_core/hosts/houdini/startup/python2.7libs/pythonrc.py index 0b92fc2706..c08feb7f2a 100644 --- a/client/ayon_core/hosts/houdini/startup/python2.7libs/pythonrc.py +++ b/client/ayon_core/hosts/houdini/startup/python2.7libs/pythonrc.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """OpenPype startup script.""" -from openpype.pipeline import install_host -from openpype.hosts.houdini.api import HoudiniHost -from openpype import AYON_SERVER_ENABLED +from ayon_core.pipeline import install_host +from ayon_core.hosts.houdini.api import HoudiniHost +from ayon_core import AYON_SERVER_ENABLED def main(): diff --git a/client/ayon_core/hosts/houdini/startup/python3.10libs/pythonrc.py b/client/ayon_core/hosts/houdini/startup/python3.10libs/pythonrc.py index 0b92fc2706..c08feb7f2a 100644 --- a/client/ayon_core/hosts/houdini/startup/python3.10libs/pythonrc.py +++ b/client/ayon_core/hosts/houdini/startup/python3.10libs/pythonrc.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """OpenPype startup script.""" -from openpype.pipeline import install_host -from openpype.hosts.houdini.api import HoudiniHost -from openpype import AYON_SERVER_ENABLED +from ayon_core.pipeline import install_host +from ayon_core.hosts.houdini.api import HoudiniHost +from ayon_core import AYON_SERVER_ENABLED def main(): diff --git a/client/ayon_core/hosts/houdini/startup/python3.7libs/pythonrc.py b/client/ayon_core/hosts/houdini/startup/python3.7libs/pythonrc.py index 0b92fc2706..c08feb7f2a 100644 --- a/client/ayon_core/hosts/houdini/startup/python3.7libs/pythonrc.py +++ b/client/ayon_core/hosts/houdini/startup/python3.7libs/pythonrc.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """OpenPype startup script.""" -from openpype.pipeline import install_host -from openpype.hosts.houdini.api import HoudiniHost -from openpype import AYON_SERVER_ENABLED +from ayon_core.pipeline import install_host +from ayon_core.hosts.houdini.api import HoudiniHost +from ayon_core import AYON_SERVER_ENABLED def main(): diff --git a/client/ayon_core/hosts/houdini/startup/python3.9libs/pythonrc.py b/client/ayon_core/hosts/houdini/startup/python3.9libs/pythonrc.py index 0b92fc2706..c08feb7f2a 100644 --- a/client/ayon_core/hosts/houdini/startup/python3.9libs/pythonrc.py +++ b/client/ayon_core/hosts/houdini/startup/python3.9libs/pythonrc.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """OpenPype startup script.""" -from openpype.pipeline import install_host -from openpype.hosts.houdini.api import HoudiniHost -from openpype import AYON_SERVER_ENABLED +from ayon_core.pipeline import install_host +from ayon_core.hosts.houdini.api import HoudiniHost +from ayon_core import AYON_SERVER_ENABLED def main(): diff --git a/client/ayon_core/hosts/max/addon.py b/client/ayon_core/hosts/max/addon.py index 9d6ab5a8b3..416014025c 100644 --- a/client/ayon_core/hosts/max/addon.py +++ b/client/ayon_core/hosts/max/addon.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import os -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon MAX_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/max/api/lib.py b/client/ayon_core/hosts/max/api/lib.py index e2d8d9c55f..444ff6af9e 100644 --- a/client/ayon_core/hosts/max/api/lib.py +++ b/client/ayon_core/hosts/max/api/lib.py @@ -6,11 +6,11 @@ import json from typing import Any, Dict, Union import six -from openpype.pipeline import get_current_project_name, colorspace -from openpype.settings import get_project_settings -from openpype.pipeline.context_tools import ( +from ayon_core.pipeline import get_current_project_name, colorspace +from ayon_core.settings import get_project_settings +from ayon_core.pipeline.context_tools import ( get_current_project, get_current_project_asset) -from openpype.style import load_stylesheet +from ayon_core.style import load_stylesheet from pymxs import runtime as rt @@ -405,7 +405,7 @@ def check_colorspace(): project_name, "max", project_settings) if max_config_data and color_mgr.Mode != rt.Name("OCIO_Custom"): if not is_headless(): - from openpype.widgets import popup + from ayon_core.widgets import popup dialog = popup.Popup(parent=parent) dialog.setWindowTitle("Warning: Wrong OCIO Mode") dialog.setMessage("This scene has wrong OCIO " diff --git a/client/ayon_core/hosts/max/api/lib_renderproducts.py b/client/ayon_core/hosts/max/api/lib_renderproducts.py index eaf5015ba8..710ed0031a 100644 --- a/client/ayon_core/hosts/max/api/lib_renderproducts.py +++ b/client/ayon_core/hosts/max/api/lib_renderproducts.py @@ -6,9 +6,9 @@ import os from pymxs import runtime as rt -from openpype.hosts.max.api.lib import get_current_renderer -from openpype.pipeline import get_current_project_name -from openpype.settings import get_project_settings +from ayon_core.hosts.max.api.lib import get_current_renderer +from ayon_core.pipeline import get_current_project_name +from ayon_core.settings import get_project_settings class RenderProducts(object): diff --git a/client/ayon_core/hosts/max/api/lib_rendersettings.py b/client/ayon_core/hosts/max/api/lib_rendersettings.py index be50e296eb..7ffc024ba3 100644 --- a/client/ayon_core/hosts/max/api/lib_rendersettings.py +++ b/client/ayon_core/hosts/max/api/lib_rendersettings.py @@ -1,11 +1,11 @@ import os from pymxs import runtime as rt -from openpype.lib import Logger -from openpype.settings import get_project_settings -from openpype.pipeline import get_current_project_name -from openpype.pipeline.context_tools import get_current_project_asset +from ayon_core.lib import Logger +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import get_current_project_name +from ayon_core.pipeline.context_tools import get_current_project_asset -from openpype.hosts.max.api.lib import ( +from ayon_core.hosts.max.api.lib import ( set_render_frame_range, get_current_renderer, get_default_render_folder diff --git a/client/ayon_core/hosts/max/api/menu.py b/client/ayon_core/hosts/max/api/menu.py index 9bdb6bd7ce..f853fc58b3 100644 --- a/client/ayon_core/hosts/max/api/menu.py +++ b/client/ayon_core/hosts/max/api/menu.py @@ -4,8 +4,8 @@ import os from qtpy import QtWidgets, QtCore from pymxs import runtime as rt -from openpype.tools.utils import host_tools -from openpype.hosts.max.api import lib +from ayon_core.tools.utils import host_tools +from ayon_core.hosts.max.api import lib class OpenPypeMenu(object): diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/client/ayon_core/hosts/max/api/pipeline.py index d0ae854dc8..1ae6262223 100644 --- a/client/ayon_core/hosts/max/api/pipeline.py +++ b/client/ayon_core/hosts/max/api/pipeline.py @@ -6,17 +6,17 @@ from operator import attrgetter import json -from openpype.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost +from ayon_core.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( register_creator_plugin_path, register_loader_plugin_path, AVALON_CONTAINER_ID, ) -from openpype.hosts.max.api.menu import OpenPypeMenu -from openpype.hosts.max.api import lib -from openpype.hosts.max.api.plugin import MS_CUSTOM_ATTRIB -from openpype.hosts.max import MAX_HOST_DIR +from ayon_core.hosts.max.api.menu import OpenPypeMenu +from ayon_core.hosts.max.api import lib +from ayon_core.hosts.max.api.plugin import MS_CUSTOM_ATTRIB +from ayon_core.hosts.max import MAX_HOST_DIR from pymxs import runtime as rt # noqa diff --git a/client/ayon_core/hosts/max/api/plugin.py b/client/ayon_core/hosts/max/api/plugin.py index 2cf0d69146..3551450c24 100644 --- a/client/ayon_core/hosts/max/api/plugin.py +++ b/client/ayon_core/hosts/max/api/plugin.py @@ -5,8 +5,8 @@ from abc import ABCMeta import six from pymxs import runtime as rt -from openpype.lib import BoolDef -from openpype.pipeline import CreatedInstance, Creator, CreatorError +from ayon_core.lib import BoolDef +from ayon_core.pipeline import CreatedInstance, Creator, CreatorError from .lib import imprint, lsattr, read diff --git a/client/ayon_core/hosts/max/hooks/force_startup_script.py b/client/ayon_core/hosts/max/hooks/force_startup_script.py index 5fb8334d4b..659be7dfc6 100644 --- a/client/ayon_core/hosts/max/hooks/force_startup_script.py +++ b/client/ayon_core/hosts/max/hooks/force_startup_script.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """Pre-launch to force 3ds max startup script.""" import os -from openpype.hosts.max import MAX_HOST_DIR -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.hosts.max import MAX_HOST_DIR +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class ForceStartupScript(PreLaunchHook): diff --git a/client/ayon_core/hosts/max/hooks/inject_python.py b/client/ayon_core/hosts/max/hooks/inject_python.py index e9dddbf710..36d53551ba 100644 --- a/client/ayon_core/hosts/max/hooks/inject_python.py +++ b/client/ayon_core/hosts/max/hooks/inject_python.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Pre-launch hook to inject python environment.""" import os -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class InjectPythonPath(PreLaunchHook): diff --git a/client/ayon_core/hosts/max/hooks/set_paths.py b/client/ayon_core/hosts/max/hooks/set_paths.py index 4b961fa91e..c18fd29295 100644 --- a/client/ayon_core/hosts/max/hooks/set_paths.py +++ b/client/ayon_core/hosts/max/hooks/set_paths.py @@ -1,4 +1,4 @@ -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class SetPath(PreLaunchHook): diff --git a/client/ayon_core/hosts/max/plugins/create/create_camera.py b/client/ayon_core/hosts/max/plugins/create/create_camera.py index 804d629ec7..a35d5fc6b9 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_camera.py +++ b/client/ayon_core/hosts/max/plugins/create/create_camera.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating camera.""" -from openpype.hosts.max.api import plugin +from ayon_core.hosts.max.api import plugin class CreateCamera(plugin.MaxCreator): diff --git a/client/ayon_core/hosts/max/plugins/create/create_maxScene.py b/client/ayon_core/hosts/max/plugins/create/create_maxScene.py index 851e26dda2..4b8328d38f 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_maxScene.py +++ b/client/ayon_core/hosts/max/plugins/create/create_maxScene.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating raw max scene.""" -from openpype.hosts.max.api import plugin +from ayon_core.hosts.max.api import plugin class CreateMaxScene(plugin.MaxCreator): diff --git a/client/ayon_core/hosts/max/plugins/create/create_model.py b/client/ayon_core/hosts/max/plugins/create/create_model.py index fc09d475ef..73f0260807 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_model.py +++ b/client/ayon_core/hosts/max/plugins/create/create_model.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for model.""" -from openpype.hosts.max.api import plugin +from ayon_core.hosts.max.api import plugin class CreateModel(plugin.MaxCreator): diff --git a/client/ayon_core/hosts/max/plugins/create/create_pointcache.py b/client/ayon_core/hosts/max/plugins/create/create_pointcache.py index c2d11f4c32..d28f5008e5 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_pointcache.py +++ b/client/ayon_core/hosts/max/plugins/create/create_pointcache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating pointcache alembics.""" -from openpype.hosts.max.api import plugin +from ayon_core.hosts.max.api import plugin class CreatePointCache(plugin.MaxCreator): diff --git a/client/ayon_core/hosts/max/plugins/create/create_pointcloud.py b/client/ayon_core/hosts/max/plugins/create/create_pointcloud.py index bc7706069d..aa6be04da4 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_pointcloud.py +++ b/client/ayon_core/hosts/max/plugins/create/create_pointcloud.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating point cloud.""" -from openpype.hosts.max.api import plugin +from ayon_core.hosts.max.api import plugin class CreatePointCloud(plugin.MaxCreator): diff --git a/client/ayon_core/hosts/max/plugins/create/create_redshift_proxy.py b/client/ayon_core/hosts/max/plugins/create/create_redshift_proxy.py index 6eb59f0a73..e524e85cf6 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_redshift_proxy.py +++ b/client/ayon_core/hosts/max/plugins/create/create_redshift_proxy.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator plugin for creating camera.""" -from openpype.hosts.max.api import plugin -from openpype.pipeline import CreatedInstance +from ayon_core.hosts.max.api import plugin +from ayon_core.pipeline import CreatedInstance class CreateRedshiftProxy(plugin.MaxCreator): diff --git a/client/ayon_core/hosts/max/plugins/create/create_render.py b/client/ayon_core/hosts/max/plugins/create/create_render.py index 617334753a..73c18bfb4b 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_render.py +++ b/client/ayon_core/hosts/max/plugins/create/create_render.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- """Creator plugin for creating camera.""" import os -from openpype.hosts.max.api import plugin -from openpype.lib import BoolDef -from openpype.hosts.max.api.lib_rendersettings import RenderSettings +from ayon_core.hosts.max.api import plugin +from ayon_core.lib import BoolDef +from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings class CreateRender(plugin.MaxCreator): diff --git a/client/ayon_core/hosts/max/plugins/create/create_review.py b/client/ayon_core/hosts/max/plugins/create/create_review.py index 78d27a722b..a757b3b5bd 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_review.py +++ b/client/ayon_core/hosts/max/plugins/create/create_review.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator plugin for creating review in Max.""" -from openpype.hosts.max.api import plugin -from openpype.lib import BoolDef, EnumDef, NumberDef +from ayon_core.hosts.max.api import plugin +from ayon_core.lib import BoolDef, EnumDef, NumberDef class CreateReview(plugin.MaxCreator): diff --git a/client/ayon_core/hosts/max/plugins/create/create_tycache.py b/client/ayon_core/hosts/max/plugins/create/create_tycache.py index 92d12e012f..81ccd3607c 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_tycache.py +++ b/client/ayon_core/hosts/max/plugins/create/create_tycache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating TyCache.""" -from openpype.hosts.max.api import plugin +from ayon_core.hosts.max.api import plugin class CreateTyCache(plugin.MaxCreator): diff --git a/client/ayon_core/hosts/max/plugins/load/load_camera_fbx.py b/client/ayon_core/hosts/max/plugins/load/load_camera_fbx.py index ce1427a980..34b120c179 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_camera_fbx.py +++ b/client/ayon_core/hosts/max/plugins/load/load_camera_fbx.py @@ -1,17 +1,17 @@ import os -from openpype.hosts.max.api import lib, maintained_selection -from openpype.hosts.max.api.lib import ( +from ayon_core.hosts.max.api import lib, maintained_selection +from ayon_core.hosts.max.api.lib import ( unique_namespace, get_namespace, object_transform_set ) -from openpype.hosts.max.api.pipeline import ( +from ayon_core.hosts.max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data ) -from openpype.pipeline import get_representation_path, load +from ayon_core.pipeline import get_representation_path, load class FbxLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/max/plugins/load/load_max_scene.py b/client/ayon_core/hosts/max/plugins/load/load_max_scene.py index 0b5f0a2858..7267d7a59e 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_max_scene.py +++ b/client/ayon_core/hosts/max/plugins/load/load_max_scene.py @@ -1,16 +1,16 @@ import os -from openpype.hosts.max.api import lib -from openpype.hosts.max.api.lib import ( +from ayon_core.hosts.max.api import lib +from ayon_core.hosts.max.api.lib import ( unique_namespace, get_namespace, object_transform_set ) -from openpype.hosts.max.api.pipeline import ( +from ayon_core.hosts.max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data ) -from openpype.pipeline import get_representation_path, load +from ayon_core.pipeline import get_representation_path, load class MaxSceneLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/max/plugins/load/load_model.py b/client/ayon_core/hosts/max/plugins/load/load_model.py index c41608c860..796e1b80ad 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_model.py +++ b/client/ayon_core/hosts/max/plugins/load/load_model.py @@ -1,11 +1,11 @@ import os -from openpype.pipeline import load, get_representation_path -from openpype.hosts.max.api.pipeline import ( +from ayon_core.pipeline import load, get_representation_path +from ayon_core.hosts.max.api.pipeline import ( containerise, get_previous_loaded_object ) -from openpype.hosts.max.api import lib -from openpype.hosts.max.api.lib import ( +from ayon_core.hosts.max.api import lib +from ayon_core.hosts.max.api.lib import ( maintained_selection, unique_namespace ) diff --git a/client/ayon_core/hosts/max/plugins/load/load_model_fbx.py b/client/ayon_core/hosts/max/plugins/load/load_model_fbx.py index 71fc382eed..827cf63b39 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_model_fbx.py +++ b/client/ayon_core/hosts/max/plugins/load/load_model_fbx.py @@ -1,16 +1,16 @@ import os -from openpype.pipeline import load, get_representation_path -from openpype.hosts.max.api.pipeline import ( +from ayon_core.pipeline import load, get_representation_path +from ayon_core.hosts.max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data ) -from openpype.hosts.max.api import lib -from openpype.hosts.max.api.lib import ( +from ayon_core.hosts.max.api import lib +from ayon_core.hosts.max.api.lib import ( unique_namespace, get_namespace, object_transform_set ) -from openpype.hosts.max.api.lib import maintained_selection +from ayon_core.hosts.max.api.lib import maintained_selection class FbxModelLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/max/plugins/load/load_model_obj.py b/client/ayon_core/hosts/max/plugins/load/load_model_obj.py index aedb288a2d..22d3d4b58a 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_model_obj.py +++ b/client/ayon_core/hosts/max/plugins/load/load_model_obj.py @@ -1,19 +1,19 @@ import os -from openpype.hosts.max.api import lib -from openpype.hosts.max.api.lib import ( +from ayon_core.hosts.max.api import lib +from ayon_core.hosts.max.api.lib import ( unique_namespace, get_namespace, maintained_selection, object_transform_set ) -from openpype.hosts.max.api.lib import maintained_selection -from openpype.hosts.max.api.pipeline import ( +from ayon_core.hosts.max.api.lib import maintained_selection +from ayon_core.hosts.max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data ) -from openpype.pipeline import get_representation_path, load +from ayon_core.pipeline import get_representation_path, load class ObjLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/max/plugins/load/load_model_usd.py b/client/ayon_core/hosts/max/plugins/load/load_model_usd.py index bce4bd4a9a..8d42219217 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_model_usd.py +++ b/client/ayon_core/hosts/max/plugins/load/load_model_usd.py @@ -1,21 +1,21 @@ import os from pymxs import runtime as rt -from openpype.pipeline.load import LoadError -from openpype.hosts.max.api import lib -from openpype.hosts.max.api.lib import ( +from ayon_core.pipeline.load import LoadError +from ayon_core.hosts.max.api import lib +from ayon_core.hosts.max.api.lib import ( unique_namespace, get_namespace, object_transform_set, get_plugins ) -from openpype.hosts.max.api.lib import maintained_selection -from openpype.hosts.max.api.pipeline import ( +from ayon_core.hosts.max.api.lib import maintained_selection +from ayon_core.hosts.max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data ) -from openpype.pipeline import get_representation_path, load +from ayon_core.pipeline import get_representation_path, load class ModelUSDLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/max/plugins/load/load_pointcache.py b/client/ayon_core/hosts/max/plugins/load/load_pointcache.py index 3c2dfe8c25..a92fa66757 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_pointcache.py +++ b/client/ayon_core/hosts/max/plugins/load/load_pointcache.py @@ -5,10 +5,10 @@ Because of limited api, alembics can be only loaded, but not easily updated. """ import os -from openpype.pipeline import load, get_representation_path -from openpype.hosts.max.api import lib, maintained_selection -from openpype.hosts.max.api.lib import unique_namespace -from openpype.hosts.max.api.pipeline import ( +from ayon_core.pipeline import load, get_representation_path +from ayon_core.hosts.max.api import lib, maintained_selection +from ayon_core.hosts.max.api.lib import unique_namespace +from ayon_core.hosts.max.api.pipeline import ( containerise, get_previous_loaded_object ) diff --git a/client/ayon_core/hosts/max/plugins/load/load_pointcache_ornatrix.py b/client/ayon_core/hosts/max/plugins/load/load_pointcache_ornatrix.py index 96060a6a6f..27b2e271d2 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_pointcache_ornatrix.py +++ b/client/ayon_core/hosts/max/plugins/load/load_pointcache_ornatrix.py @@ -1,19 +1,19 @@ import os -from openpype.pipeline import load, get_representation_path -from openpype.pipeline.load import LoadError -from openpype.hosts.max.api.pipeline import ( +from ayon_core.pipeline import load, get_representation_path +from ayon_core.pipeline.load import LoadError +from ayon_core.hosts.max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data ) -from openpype.hosts.max.api.lib import ( +from ayon_core.hosts.max.api.lib import ( unique_namespace, get_namespace, object_transform_set, get_plugins ) -from openpype.hosts.max.api import lib +from ayon_core.hosts.max.api import lib from pymxs import runtime as rt diff --git a/client/ayon_core/hosts/max/plugins/load/load_pointcloud.py b/client/ayon_core/hosts/max/plugins/load/load_pointcloud.py index e0317a2e22..45e3da5621 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_pointcloud.py +++ b/client/ayon_core/hosts/max/plugins/load/load_pointcloud.py @@ -1,16 +1,16 @@ import os -from openpype.hosts.max.api import lib, maintained_selection -from openpype.hosts.max.api.lib import ( +from ayon_core.hosts.max.api import lib, maintained_selection +from ayon_core.hosts.max.api.lib import ( unique_namespace, ) -from openpype.hosts.max.api.pipeline import ( +from ayon_core.hosts.max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data ) -from openpype.pipeline import get_representation_path, load +from ayon_core.pipeline import get_representation_path, load class PointCloudLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/max/plugins/load/load_redshift_proxy.py b/client/ayon_core/hosts/max/plugins/load/load_redshift_proxy.py index daf6d3e169..3f73210c24 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_redshift_proxy.py +++ b/client/ayon_core/hosts/max/plugins/load/load_redshift_proxy.py @@ -1,18 +1,18 @@ import os import clique -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path ) -from openpype.pipeline.load import LoadError -from openpype.hosts.max.api.pipeline import ( +from ayon_core.pipeline.load import LoadError +from ayon_core.hosts.max.api.pipeline import ( containerise, update_custom_attribute_data, get_previous_loaded_object ) -from openpype.hosts.max.api import lib -from openpype.hosts.max.api.lib import ( +from ayon_core.hosts.max.api import lib +from ayon_core.hosts.max.api.lib import ( unique_namespace, get_plugins ) diff --git a/client/ayon_core/hosts/max/plugins/load/load_tycache.py b/client/ayon_core/hosts/max/plugins/load/load_tycache.py index 41ea267c3d..48fb5c447a 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_tycache.py +++ b/client/ayon_core/hosts/max/plugins/load/load_tycache.py @@ -1,15 +1,15 @@ import os -from openpype.hosts.max.api import lib, maintained_selection -from openpype.hosts.max.api.lib import ( +from ayon_core.hosts.max.api import lib, maintained_selection +from ayon_core.hosts.max.api.lib import ( unique_namespace, ) -from openpype.hosts.max.api.pipeline import ( +from ayon_core.hosts.max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data ) -from openpype.pipeline import get_representation_path, load +from ayon_core.pipeline import get_representation_path, load class TyCacheLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_render.py b/client/ayon_core/hosts/max/plugins/publish/collect_render.py index 8abffa5ab6..a97e8a154e 100644 --- a/client/ayon_core/hosts/max/plugins/publish/collect_render.py +++ b/client/ayon_core/hosts/max/plugins/publish/collect_render.py @@ -4,11 +4,11 @@ import os import pyblish.api from pymxs import runtime as rt -from openpype.pipeline.publish import KnownPublishError -from openpype.hosts.max.api import colorspace -from openpype.hosts.max.api.lib import get_max_version, get_current_renderer -from openpype.hosts.max.api.lib_rendersettings import RenderSettings -from openpype.hosts.max.api.lib_renderproducts import RenderProducts +from ayon_core.pipeline.publish import KnownPublishError +from ayon_core.hosts.max.api import colorspace +from ayon_core.hosts.max.api.lib import get_max_version, get_current_renderer +from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings +from ayon_core.hosts.max.api.lib_renderproducts import RenderProducts class CollectRender(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_review.py b/client/ayon_core/hosts/max/plugins/publish/collect_review.py index e7e957e6f1..98899de4da 100644 --- a/client/ayon_core/hosts/max/plugins/publish/collect_review.py +++ b/client/ayon_core/hosts/max/plugins/publish/collect_review.py @@ -3,9 +3,9 @@ import pyblish.api from pymxs import runtime as rt -from openpype.lib import BoolDef -from openpype.hosts.max.api.lib import get_max_version -from openpype.pipeline.publish import ( +from ayon_core.lib import BoolDef +from ayon_core.hosts.max.api.lib import get_max_version +from ayon_core.pipeline.publish import ( OpenPypePyblishPluginMixin, KnownPublishError ) diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_tycache_attributes.py b/client/ayon_core/hosts/max/plugins/publish/collect_tycache_attributes.py index 0351ca45c5..248a719218 100644 --- a/client/ayon_core/hosts/max/plugins/publish/collect_tycache_attributes.py +++ b/client/ayon_core/hosts/max/plugins/publish/collect_tycache_attributes.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype.lib import EnumDef, TextDef -from openpype.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.lib import EnumDef, TextDef +from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin class CollectTyCacheData(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_alembic.py b/client/ayon_core/hosts/max/plugins/publish/extract_alembic.py index 24e0121a61..67b5174200 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_alembic.py +++ b/client/ayon_core/hosts/max/plugins/publish/extract_alembic.py @@ -39,11 +39,11 @@ Note: """ import os import pyblish.api -from openpype.pipeline import publish, OptionalPyblishPluginMixin +from ayon_core.pipeline import publish, OptionalPyblishPluginMixin from pymxs import runtime as rt -from openpype.hosts.max.api import maintained_selection -from openpype.hosts.max.api.lib import suspended_refresh -from openpype.lib import BoolDef +from ayon_core.hosts.max.api import maintained_selection +from ayon_core.hosts.max.api.lib import suspended_refresh +from ayon_core.lib import BoolDef class ExtractAlembic(publish.Extractor, diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_fbx.py b/client/ayon_core/hosts/max/plugins/publish/extract_fbx.py index 7454cd08d1..3d80588c47 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_fbx.py +++ b/client/ayon_core/hosts/max/plugins/publish/extract_fbx.py @@ -1,9 +1,9 @@ import os import pyblish.api -from openpype.pipeline import publish, OptionalPyblishPluginMixin +from ayon_core.pipeline import publish, OptionalPyblishPluginMixin from pymxs import runtime as rt -from openpype.hosts.max.api import maintained_selection -from openpype.hosts.max.api.lib import convert_unit_scale +from ayon_core.hosts.max.api import maintained_selection +from ayon_core.hosts.max.api.lib import convert_unit_scale class ExtractModelFbx(publish.Extractor, OptionalPyblishPluginMixin): diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_max_scene_raw.py b/client/ayon_core/hosts/max/plugins/publish/extract_max_scene_raw.py index 791cc65fcd..f5c703564c 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_max_scene_raw.py +++ b/client/ayon_core/hosts/max/plugins/publish/extract_max_scene_raw.py @@ -1,6 +1,6 @@ import os import pyblish.api -from openpype.pipeline import publish, OptionalPyblishPluginMixin +from ayon_core.pipeline import publish, OptionalPyblishPluginMixin from pymxs import runtime as rt diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_model_obj.py b/client/ayon_core/hosts/max/plugins/publish/extract_model_obj.py index 8464353164..03bdde7d5d 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_model_obj.py +++ b/client/ayon_core/hosts/max/plugins/publish/extract_model_obj.py @@ -1,10 +1,10 @@ import os import pyblish.api -from openpype.pipeline import publish, OptionalPyblishPluginMixin +from ayon_core.pipeline import publish, OptionalPyblishPluginMixin from pymxs import runtime as rt -from openpype.hosts.max.api import maintained_selection -from openpype.hosts.max.api.lib import suspended_refresh -from openpype.pipeline.publish import KnownPublishError +from ayon_core.hosts.max.api import maintained_selection +from ayon_core.hosts.max.api.lib import suspended_refresh +from ayon_core.pipeline.publish import KnownPublishError class ExtractModelObj(publish.Extractor, OptionalPyblishPluginMixin): diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_model_usd.py b/client/ayon_core/hosts/max/plugins/publish/extract_model_usd.py index da37c77bf7..64791e4c7d 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_model_usd.py +++ b/client/ayon_core/hosts/max/plugins/publish/extract_model_usd.py @@ -3,8 +3,8 @@ import os import pyblish.api from pymxs import runtime as rt -from openpype.hosts.max.api import maintained_selection -from openpype.pipeline import OptionalPyblishPluginMixin, publish +from ayon_core.hosts.max.api import maintained_selection +from ayon_core.pipeline import OptionalPyblishPluginMixin, publish class ExtractModelUSD(publish.Extractor, diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_pointcloud.py b/client/ayon_core/hosts/max/plugins/publish/extract_pointcloud.py index d9fbe5e9dd..294d63794e 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_pointcloud.py +++ b/client/ayon_core/hosts/max/plugins/publish/extract_pointcloud.py @@ -3,8 +3,8 @@ import os import pyblish.api from pymxs import runtime as rt -from openpype.hosts.max.api import maintained_selection -from openpype.pipeline import publish +from ayon_core.hosts.max.api import maintained_selection +from ayon_core.pipeline import publish class ExtractPointCloud(publish.Extractor): diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_redshift_proxy.py b/client/ayon_core/hosts/max/plugins/publish/extract_redshift_proxy.py index 47ed85977b..6a647670bc 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_redshift_proxy.py +++ b/client/ayon_core/hosts/max/plugins/publish/extract_redshift_proxy.py @@ -1,8 +1,8 @@ import os import pyblish.api -from openpype.pipeline import publish +from ayon_core.pipeline import publish from pymxs import runtime as rt -from openpype.hosts.max.api import maintained_selection +from ayon_core.hosts.max.api import maintained_selection class ExtractRedshiftProxy(publish.Extractor): diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_review_animation.py b/client/ayon_core/hosts/max/plugins/publish/extract_review_animation.py index 99dc5c5cdc..12f1fbb63b 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_review_animation.py +++ b/client/ayon_core/hosts/max/plugins/publish/extract_review_animation.py @@ -1,7 +1,7 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.max.api.preview_animation import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.max.api.preview_animation import ( render_preview_animation ) diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_thumbnail.py b/client/ayon_core/hosts/max/plugins/publish/extract_thumbnail.py index 02fa75e032..5764ce98c4 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_thumbnail.py +++ b/client/ayon_core/hosts/max/plugins/publish/extract_thumbnail.py @@ -1,7 +1,7 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.max.api.preview_animation import render_preview_animation +from ayon_core.pipeline import publish +from ayon_core.hosts.max.api.preview_animation import render_preview_animation class ExtractThumbnail(publish.Extractor): diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_tycache.py b/client/ayon_core/hosts/max/plugins/publish/extract_tycache.py index 9bfe74f679..50bb06a765 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_tycache.py +++ b/client/ayon_core/hosts/max/plugins/publish/extract_tycache.py @@ -3,8 +3,8 @@ import os import pyblish.api from pymxs import runtime as rt -from openpype.hosts.max.api import maintained_selection -from openpype.pipeline import publish +from ayon_core.hosts.max.api import maintained_selection +from ayon_core.pipeline import publish class ExtractTyCache(publish.Extractor): diff --git a/client/ayon_core/hosts/max/plugins/publish/increment_workfile_version.py b/client/ayon_core/hosts/max/plugins/publish/increment_workfile_version.py index 3dec214f77..5f319966fe 100644 --- a/client/ayon_core/hosts/max/plugins/publish/increment_workfile_version.py +++ b/client/ayon_core/hosts/max/plugins/publish/increment_workfile_version.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.lib import version_up +from ayon_core.lib import version_up from pymxs import runtime as rt diff --git a/client/ayon_core/hosts/max/plugins/publish/save_scenes_for_cameras.py b/client/ayon_core/hosts/max/plugins/publish/save_scenes_for_cameras.py index f089bf663c..817db1b28f 100644 --- a/client/ayon_core/hosts/max/plugins/publish/save_scenes_for_cameras.py +++ b/client/ayon_core/hosts/max/plugins/publish/save_scenes_for_cameras.py @@ -4,9 +4,9 @@ import sys import tempfile from pymxs import runtime as rt -from openpype.lib import run_subprocess -from openpype.hosts.max.api.lib_rendersettings import RenderSettings -from openpype.hosts.max.api.lib_renderproducts import RenderProducts +from ayon_core.lib import run_subprocess +from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings +from ayon_core.hosts.max.api.lib_renderproducts import RenderProducts class SaveScenesForCamera(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_attributes.py b/client/ayon_core/hosts/max/plugins/publish/validate_attributes.py index 0632ee38f0..444a8f0829 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_attributes.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_attributes.py @@ -3,7 +3,7 @@ from pyblish.api import ContextPlugin, ValidatorOrder from pymxs import runtime as rt -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError, RepairContextAction diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_camera_contents.py b/client/ayon_core/hosts/max/plugins/publish/validate_camera_contents.py index 0c61e6431d..0473fd4a8a 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_camera_contents.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_camera_contents.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError from pymxs import runtime as rt diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_deadline_publish.py b/client/ayon_core/hosts/max/plugins/publish/validate_deadline_publish.py index b2f0e863f4..2c9ca4ae64 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_deadline_publish.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_deadline_publish.py @@ -1,13 +1,13 @@ import os import pyblish.api from pymxs import runtime as rt -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError, OptionalPyblishPluginMixin ) -from openpype.hosts.max.api.lib_rendersettings import RenderSettings +from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings class ValidateDeadlinePublish(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_frame_range.py b/client/ayon_core/hosts/max/plugins/publish/validate_frame_range.py index 0e8316e844..75a83c2b05 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_frame_range.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_frame_range.py @@ -1,16 +1,16 @@ import pyblish.api from pymxs import runtime as rt -from openpype.pipeline import ( +from ayon_core.pipeline import ( OptionalPyblishPluginMixin ) -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError, KnownPublishError ) -from openpype.hosts.max.api.lib import get_frame_range, set_timeline +from ayon_core.hosts.max.api.lib import get_frame_range, set_timeline class ValidateFrameRange(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_instance_has_members.py b/client/ayon_core/hosts/max/plugins/publish/validate_instance_has_members.py index 3c0039d5e0..552e9ea0e2 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_instance_has_members.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_instance_has_members.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateInstanceHasMembers(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py b/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py index efa06795b0..fe6e32b27b 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py @@ -4,12 +4,12 @@ import os import pyblish.api from pymxs import runtime as rt -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, OptionalPyblishPluginMixin, PublishValidationError ) -from openpype.hosts.max.api.lib import get_plugins +from ayon_core.hosts.max.api.lib import get_plugins class ValidateLoadedPlugin(OptionalPyblishPluginMixin, diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_model_contents.py b/client/ayon_core/hosts/max/plugins/publish/validate_model_contents.py index cfe016f03f..9a4d988aa4 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_model_contents.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_model_contents.py @@ -2,7 +2,7 @@ import pyblish.api from pymxs import runtime as rt -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateModelContent(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_pointcloud.py b/client/ayon_core/hosts/max/plugins/publish/validate_pointcloud.py index 54d6d0f11a..a025ed3992 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_pointcloud.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_pointcloud.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError from pymxs import runtime as rt diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_renderable_camera.py b/client/ayon_core/hosts/max/plugins/publish/validate_renderable_camera.py index 61321661b5..ffd6b183fe 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_renderable_camera.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_renderable_camera.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin) -from openpype.pipeline.publish import RepairAction -from openpype.hosts.max.api.lib import get_current_renderer +from ayon_core.pipeline.publish import RepairAction +from ayon_core.hosts.max.api.lib import get_current_renderer from pymxs import runtime as rt diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_renderer_redshift_proxy.py b/client/ayon_core/hosts/max/plugins/publish/validate_renderer_redshift_proxy.py index bc82f82f3b..de3a806c85 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_renderer_redshift_proxy.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_renderer_redshift_proxy.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError from pymxs import runtime as rt -from openpype.pipeline.publish import RepairAction -from openpype.hosts.max.api.lib import get_current_renderer +from ayon_core.pipeline.publish import RepairAction +from ayon_core.hosts.max.api.lib import get_current_renderer class ValidateRendererRedshiftProxy(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_resolution_setting.py b/client/ayon_core/hosts/max/plugins/publish/validate_resolution_setting.py index 1c4b05c556..0058d3b262 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_resolution_setting.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_resolution_setting.py @@ -1,13 +1,13 @@ import pyblish.api from pymxs import runtime as rt -from openpype.pipeline import ( +from ayon_core.pipeline import ( OptionalPyblishPluginMixin ) -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, PublishValidationError ) -from openpype.hosts.max.api.lib import reset_scene_resolution +from ayon_core.hosts.max.api.lib import reset_scene_resolution class ValidateResolutionSetting(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_scene_saved.py b/client/ayon_core/hosts/max/plugins/publish/validate_scene_saved.py index 8506b17315..3028a55337 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_scene_saved.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_scene_saved.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError from pymxs import runtime as rt diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_tyflow_data.py b/client/ayon_core/hosts/max/plugins/publish/validate_tyflow_data.py index c0f29422ec..8dd8a1bb68 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_tyflow_data.py +++ b/client/ayon_core/hosts/max/plugins/publish/validate_tyflow_data.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError from pymxs import runtime as rt diff --git a/client/ayon_core/hosts/max/startup/startup.py b/client/ayon_core/hosts/max/startup/startup.py index 0d3135a16f..49a861bad0 100644 --- a/client/ayon_core/hosts/max/startup/startup.py +++ b/client/ayon_core/hosts/max/startup/startup.py @@ -8,8 +8,8 @@ for path in os.environ["PYTHONPATH"].split(os.pathsep): if path and path not in sys.path: sys.path.append(path) -from openpype.hosts.max.api import MaxHost -from openpype.pipeline import install_host +from ayon_core.hosts.max.api import MaxHost +from ayon_core.pipeline import install_host host = MaxHost() install_host(host) diff --git a/client/ayon_core/hosts/maya/addon.py b/client/ayon_core/hosts/maya/addon.py index b9ecb8279f..c411f79d6e 100644 --- a/client/ayon_core/hosts/maya/addon.py +++ b/client/ayon_core/hosts/maya/addon.py @@ -1,5 +1,5 @@ import os -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon MAYA_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/maya/api/action.py b/client/ayon_core/hosts/maya/api/action.py index 277f4cc238..1edca82ee4 100644 --- a/client/ayon_core/hosts/maya/api/action.py +++ b/client/ayon_core/hosts/maya/api/action.py @@ -3,8 +3,8 @@ from __future__ import absolute_import import pyblish.api -from openpype.client import get_asset_by_name -from openpype.pipeline.publish import get_errored_instances_from_context +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline.publish import get_errored_instances_from_context class GenerateUUIDsOnInvalidAction(pyblish.api.Action): diff --git a/client/ayon_core/hosts/maya/api/commands.py b/client/ayon_core/hosts/maya/api/commands.py index 46494413b7..b52d5e6c2d 100644 --- a/client/ayon_core/hosts/maya/api/commands.py +++ b/client/ayon_core/hosts/maya/api/commands.py @@ -2,8 +2,8 @@ """OpenPype script commands to be used directly in Maya.""" from maya import cmds -from openpype.client import get_asset_by_name, get_project -from openpype.pipeline import get_current_project_name, get_current_asset_name +from ayon_core.client import get_asset_by_name, get_project +from ayon_core.pipeline import get_current_project_name, get_current_asset_name class ToolWindows: @@ -40,10 +40,10 @@ class ToolWindows: def edit_shader_definitions(): from qtpy import QtWidgets - from openpype.hosts.maya.api.shader_definition_editor import ( + from ayon_core.hosts.maya.api.shader_definition_editor import ( ShaderDefinitionsEditor ) - from openpype.tools.utils import qt_app_context + from ayon_core.tools.utils import qt_app_context top_level_widgets = QtWidgets.QApplication.topLevelWidgets() main_window = next(widget for widget in top_level_widgets diff --git a/client/ayon_core/hosts/maya/api/customize.py b/client/ayon_core/hosts/maya/api/customize.py index f4c4d6ed88..da046b538d 100644 --- a/client/ayon_core/hosts/maya/api/customize.py +++ b/client/ayon_core/hosts/maya/api/customize.py @@ -8,8 +8,8 @@ from functools import partial import maya.cmds as cmds import maya.mel as mel -from openpype import resources -from openpype.tools.utils import host_tools +from ayon_core import resources +from ayon_core.tools.utils import host_tools from .lib import get_main_window from ..tools import show_look_assigner diff --git a/client/ayon_core/hosts/maya/api/exitstack.py b/client/ayon_core/hosts/maya/api/exitstack.py index d151ee16d7..5eb7e15784 100644 --- a/client/ayon_core/hosts/maya/api/exitstack.py +++ b/client/ayon_core/hosts/maya/api/exitstack.py @@ -6,7 +6,7 @@ compatible implementation to support bothPython 2 and Python 3. Instead of using ExitStack from contextlib, use it from this module: ->>> from openpype.hosts.maya.api.exitstack import ExitStack +>>> from ayon_core.hosts.maya.api.exitstack import ExitStack It will provide the appropriate ExitStack implementation for the current running Python version. diff --git a/client/ayon_core/hosts/maya/api/fbx.py b/client/ayon_core/hosts/maya/api/fbx.py index c8f4050bc1..97e95d2ec4 100644 --- a/client/ayon_core/hosts/maya/api/fbx.py +++ b/client/ayon_core/hosts/maya/api/fbx.py @@ -6,7 +6,7 @@ from pyblish.api import Instance from maya import cmds # noqa import maya.mel as mel # noqa -from openpype.hosts.maya.api.lib import maintained_selection +from ayon_core.hosts.maya.api.lib import maintained_selection class FBXExtractor: diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py index da34896c3f..6fc2c92144 100644 --- a/client/ayon_core/hosts/maya/api/lib.py +++ b/client/ayon_core/hosts/maya/api/lib.py @@ -19,15 +19,15 @@ from six import string_types from maya import cmds, mel from maya.api import OpenMaya -from openpype.client import ( +from ayon_core.client import ( get_project, get_asset_by_name, get_subsets, get_last_versions, get_representation_by_name ) -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( get_current_project_name, get_current_asset_name, get_current_task_name, @@ -37,10 +37,10 @@ from openpype.pipeline import ( load_container, registered_host ) -from openpype.lib import NumberDef -from openpype.pipeline.context_tools import get_current_project_asset -from openpype.pipeline.create import CreateContext -from openpype.lib.profiles_filtering import filter_profiles +from ayon_core.lib import NumberDef +from ayon_core.pipeline.context_tools import get_current_project_asset +from ayon_core.pipeline.create import CreateContext +from ayon_core.lib.profiles_filtering import filter_profiles self = sys.modules[__name__] @@ -2671,7 +2671,7 @@ def validate_fps(): fps_match = current_fps == expected_fps if not fps_match and not IS_HEADLESS: - from openpype.widgets import popup + from ayon_core.widgets import popup parent = get_main_window() @@ -3284,7 +3284,7 @@ def update_content_on_context_change(): def show_message(title, msg): from qtpy import QtWidgets - from openpype.widgets import message_window + from ayon_core.widgets import message_window # Find maya main window top_level_widgets = {w.objectName(): w for w in diff --git a/client/ayon_core/hosts/maya/api/lib_renderproducts.py b/client/ayon_core/hosts/maya/api/lib_renderproducts.py index b5b71a5a36..7f26145e1d 100644 --- a/client/ayon_core/hosts/maya/api/lib_renderproducts.py +++ b/client/ayon_core/hosts/maya/api/lib_renderproducts.py @@ -46,7 +46,7 @@ import attr from . import lib from . import lib_rendersetup -from openpype.pipeline.colorspace import get_ocio_config_views +from ayon_core.pipeline.colorspace import get_ocio_config_views from maya import cmds, mel diff --git a/client/ayon_core/hosts/maya/api/lib_rendersettings.py b/client/ayon_core/hosts/maya/api/lib_rendersettings.py index 1f964589a9..54ee7888b3 100644 --- a/client/ayon_core/hosts/maya/api/lib_rendersettings.py +++ b/client/ayon_core/hosts/maya/api/lib_rendersettings.py @@ -3,12 +3,12 @@ import six import sys -from openpype.lib import Logger -from openpype.settings import get_project_settings +from ayon_core.lib import Logger +from ayon_core.settings import get_project_settings -from openpype.pipeline import CreatorError, get_current_project_name -from openpype.pipeline.context_tools import get_current_project_asset -from openpype.hosts.maya.api.lib import reset_frame_range +from ayon_core.pipeline import CreatorError, get_current_project_name +from ayon_core.pipeline.context_tools import get_current_project_asset +from ayon_core.hosts.maya.api.lib import reset_frame_range class RenderSettings(object): diff --git a/client/ayon_core/hosts/maya/api/lib_rendersetup.py b/client/ayon_core/hosts/maya/api/lib_rendersetup.py index 440ee21a52..fb6dd13ce0 100644 --- a/client/ayon_core/hosts/maya/api/lib_rendersetup.py +++ b/client/ayon_core/hosts/maya/api/lib_rendersetup.py @@ -19,7 +19,7 @@ from maya.app.renderSetup.model.override import ( UniqueOverride ) -from openpype.hosts.maya.api.lib import get_attribute +from ayon_core.hosts.maya.api.lib import get_attribute EXACT_MATCH = 0 PARENT_MATCH = 1 diff --git a/client/ayon_core/hosts/maya/api/menu.py b/client/ayon_core/hosts/maya/api/menu.py index 18a4ea0e9a..43bd374210 100644 --- a/client/ayon_core/hosts/maya/api/menu.py +++ b/client/ayon_core/hosts/maya/api/menu.py @@ -7,13 +7,13 @@ from qtpy import QtWidgets, QtGui import maya.utils import maya.cmds as cmds -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_current_asset_name, get_current_task_name ) -from openpype.pipeline.workfile import BuildWorkfile -from openpype.tools.utils import host_tools -from openpype.hosts.maya.api import lib, lib_rendersettings +from ayon_core.pipeline.workfile import BuildWorkfile +from ayon_core.tools.utils import host_tools +from ayon_core.hosts.maya.api import lib, lib_rendersettings from .lib import get_main_window, IS_HEADLESS from ..tools import show_look_assigner diff --git a/client/ayon_core/hosts/maya/api/pipeline.py b/client/ayon_core/hosts/maya/api/pipeline.py index 1ecfdfaa40..43cc94d61e 100644 --- a/client/ayon_core/hosts/maya/api/pipeline.py +++ b/client/ayon_core/hosts/maya/api/pipeline.py @@ -11,21 +11,21 @@ import maya.api.OpenMaya as om import pyblish.api -from openpype.settings import get_project_settings -from openpype.host import ( +from ayon_core.settings import get_project_settings +from ayon_core.host import ( HostBase, IWorkfileHost, ILoadHost, IPublishHost, HostDirmap, ) -from openpype.tools.utils import host_tools -from openpype.tools.workfiles.lock_dialog import WorkfileLockDialog -from openpype.lib import ( +from ayon_core.tools.utils import host_tools +from ayon_core.tools.workfiles.lock_dialog import WorkfileLockDialog +from ayon_core.lib import ( register_event_callback, emit_event ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( legacy_io, get_current_project_name, register_loader_plugin_path, @@ -36,15 +36,15 @@ from openpype.pipeline import ( deregister_creator_plugin_path, AVALON_CONTAINER_ID, ) -from openpype.pipeline.load import any_outdated_containers -from openpype.pipeline.workfile.lock_workfile import ( +from ayon_core.pipeline.load import any_outdated_containers +from ayon_core.pipeline.workfile.lock_workfile import ( create_workfile_lock, remove_workfile_lock, is_workfile_locked, is_workfile_lock_enabled ) -from openpype.hosts.maya import MAYA_ROOT_DIR -from openpype.hosts.maya.lib import create_workspace_mel +from ayon_core.hosts.maya import MAYA_ROOT_DIR +from ayon_core.hosts.maya.lib import create_workspace_mel from . import menu, lib from .workfile_template_builder import MayaPlaceholderLoadPlugin @@ -583,7 +583,7 @@ def on_save(): def on_open(): """On scene open let's assume the containers have changed.""" - from openpype.widgets import popup + from ayon_core.widgets import popup # Validate FPS after update_task_from_path to # ensure it is using correct FPS for the asset diff --git a/client/ayon_core/hosts/maya/api/plugin.py b/client/ayon_core/hosts/maya/api/plugin.py index e684a91fe2..3e9b42e5b7 100644 --- a/client/ayon_core/hosts/maya/api/plugin.py +++ b/client/ayon_core/hosts/maya/api/plugin.py @@ -7,10 +7,10 @@ import six from maya import cmds from maya.app.renderSetup.model import renderSetup -from openpype import AYON_SERVER_ENABLED -from openpype.lib import BoolDef, Logger -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.lib import BoolDef, Logger +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( AVALON_CONTAINER_ID, Anatomy, @@ -24,9 +24,9 @@ from openpype.pipeline import ( LoaderPlugin, get_representation_path, ) -from openpype.pipeline.load import LoadError -from openpype.client import get_asset_by_name -from openpype.pipeline.create import get_subset_name +from ayon_core.pipeline.load import LoadError +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline.create import get_subset_name from . import lib from .lib import imprint, read @@ -745,7 +745,7 @@ class ReferenceLoader(Loader): def update(self, container, representation): from maya import cmds - from openpype.hosts.maya.api.lib import get_container_members + from ayon_core.hosts.maya.api.lib import get_container_members node = container["objectName"] diff --git a/client/ayon_core/hosts/maya/api/setdress.py b/client/ayon_core/hosts/maya/api/setdress.py index 7624aacd0f..7a1054cc49 100644 --- a/client/ayon_core/hosts/maya/api/setdress.py +++ b/client/ayon_core/hosts/maya/api/setdress.py @@ -9,14 +9,14 @@ import six from maya import cmds -from openpype.client import ( +from ayon_core.client import ( get_version_by_name, get_last_version_by_subset_id, get_representation_by_id, get_representation_by_name, get_representation_parents, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( schema, discover_loader_plugins, loaders_from_representation, @@ -26,7 +26,7 @@ from openpype.pipeline import ( get_representation_path, get_current_project_name, ) -from openpype.hosts.maya.api.lib import ( +from ayon_core.hosts.maya.api.lib import ( matrix_equals, unique_namespace, get_container_transforms, diff --git a/client/ayon_core/hosts/maya/api/shader_definition_editor.py b/client/ayon_core/hosts/maya/api/shader_definition_editor.py index 6edafb1f35..2fb06c32f0 100644 --- a/client/ayon_core/hosts/maya/api/shader_definition_editor.py +++ b/client/ayon_core/hosts/maya/api/shader_definition_editor.py @@ -6,8 +6,8 @@ Shader names are stored as simple text file over GridFS in mongodb. """ import os from qtpy import QtWidgets, QtCore, QtGui -from openpype.client.mongo import OpenPypeMongoConnection -from openpype import resources +from ayon_core.client.mongo import OpenPypeMongoConnection +from ayon_core import resources import gridfs diff --git a/client/ayon_core/hosts/maya/api/workfile_template_builder.py b/client/ayon_core/hosts/maya/api/workfile_template_builder.py index d1ba3cc306..c3c61e5444 100644 --- a/client/ayon_core/hosts/maya/api/workfile_template_builder.py +++ b/client/ayon_core/hosts/maya/api/workfile_template_builder.py @@ -2,15 +2,15 @@ import json from maya import cmds -from openpype.pipeline import registered_host, get_current_asset_name -from openpype.pipeline.workfile.workfile_template_builder import ( +from ayon_core.pipeline import registered_host, get_current_asset_name +from ayon_core.pipeline.workfile.workfile_template_builder import ( TemplateAlreadyImported, AbstractTemplateBuilder, PlaceholderPlugin, LoadPlaceholderItem, PlaceholderLoadMixin, ) -from openpype.tools.workfile_template_build import ( +from ayon_core.tools.workfile_template_build import ( WorkfileBuildPlaceholderDialog, ) diff --git a/client/ayon_core/hosts/maya/hooks/pre_auto_load_plugins.py b/client/ayon_core/hosts/maya/hooks/pre_auto_load_plugins.py index 4b1ea698a6..599a75feb7 100644 --- a/client/ayon_core/hosts/maya/hooks/pre_auto_load_plugins.py +++ b/client/ayon_core/hosts/maya/hooks/pre_auto_load_plugins.py @@ -1,4 +1,4 @@ -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class MayaPreAutoLoadPlugins(PreLaunchHook): diff --git a/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py b/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py index 6cd2c69e20..7198f98131 100644 --- a/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py +++ b/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py @@ -1,5 +1,5 @@ -from openpype.lib.applications import PreLaunchHook, LaunchTypes -from openpype.hosts.maya.lib import create_workspace_mel +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.hosts.maya.lib import create_workspace_mel class PreCopyMel(PreLaunchHook): diff --git a/client/ayon_core/hosts/maya/hooks/pre_open_workfile_post_initialization.py b/client/ayon_core/hosts/maya/hooks/pre_open_workfile_post_initialization.py index 1fe3c3ca2c..11d7172994 100644 --- a/client/ayon_core/hosts/maya/hooks/pre_open_workfile_post_initialization.py +++ b/client/ayon_core/hosts/maya/hooks/pre_open_workfile_post_initialization.py @@ -1,4 +1,4 @@ -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class MayaPreOpenWorkfilePostInitialization(PreLaunchHook): diff --git a/client/ayon_core/hosts/maya/lib.py b/client/ayon_core/hosts/maya/lib.py index 765c60381b..6fa8dfdce9 100644 --- a/client/ayon_core/hosts/maya/lib.py +++ b/client/ayon_core/hosts/maya/lib.py @@ -1,6 +1,6 @@ import os -from openpype.settings import get_project_settings -from openpype.lib import Logger +from ayon_core.settings import get_project_settings +from ayon_core.lib import Logger def create_workspace_mel(workdir, project_name, project_settings=None): diff --git a/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py b/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py index cd8faf291b..029ea25b40 100644 --- a/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py +++ b/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py @@ -1,8 +1,8 @@ -from openpype.pipeline.create.creator_plugins import SubsetConvertorPlugin -from openpype.hosts.maya.api import plugin -from openpype.hosts.maya.api.lib import read +from ayon_core.pipeline.create.creator_plugins import SubsetConvertorPlugin +from ayon_core.hosts.maya.api import plugin +from ayon_core.hosts.maya.api.lib import read -from openpype.client import get_asset_by_name +from ayon_core.client import get_asset_by_name from maya import cmds from maya.app.renderSetup.model import renderSetup diff --git a/client/ayon_core/hosts/maya/plugins/create/create_animation.py b/client/ayon_core/hosts/maya/plugins/create/create_animation.py index 115c73c0d3..e6849b4468 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_animation.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_animation.py @@ -1,8 +1,8 @@ -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( lib, plugin ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef, TextDef ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py b/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py index 1ef132725f..a9455620b8 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py @@ -1,8 +1,8 @@ -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( lib, plugin ) -from openpype.lib import ( +from ayon_core.lib import ( NumberDef, BoolDef ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_assembly.py b/client/ayon_core/hosts/maya/plugins/create/create_assembly.py index 813fe4da04..2b78271a49 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_assembly.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_assembly.py @@ -1,4 +1,4 @@ -from openpype.hosts.maya.api import plugin +from ayon_core.hosts.maya.api import plugin class CreateAssembly(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_camera.py b/client/ayon_core/hosts/maya/plugins/create/create_camera.py index 0219f56330..37d5a817a5 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_camera.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_camera.py @@ -1,8 +1,8 @@ -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( lib, plugin ) -from openpype.lib import BoolDef +from ayon_core.lib import BoolDef class CreateCamera(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_layout.py b/client/ayon_core/hosts/maya/plugins/create/create_layout.py index 168743d4dc..bd61fa44c6 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_layout.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_layout.py @@ -1,5 +1,5 @@ -from openpype.hosts.maya.api import plugin -from openpype.lib import BoolDef +from ayon_core.hosts.maya.api import plugin +from ayon_core.lib import BoolDef class CreateLayout(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_look.py b/client/ayon_core/hosts/maya/plugins/create/create_look.py index 11a69151fd..4655ec1377 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_look.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_look.py @@ -1,8 +1,8 @@ -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( plugin, lib ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef, TextDef ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py b/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py index e64eb6a471..00de553404 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py @@ -1,8 +1,8 @@ -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( lib, plugin ) -from openpype.lib import BoolDef +from ayon_core.lib import BoolDef class CreateMatchmove(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py b/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py index cc9a14bd3a..f6c8a55e68 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py @@ -1,5 +1,5 @@ -from openpype.hosts.maya.api import plugin, lib -from openpype.lib import ( +from ayon_core.hosts.maya.api import plugin, lib +from ayon_core.lib import ( BoolDef, EnumDef, TextDef diff --git a/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py b/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py index b61c97aebf..c4024d3710 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py @@ -1,4 +1,4 @@ -from openpype.hosts.maya.api import plugin +from ayon_core.hosts.maya.api import plugin class CreateMayaScene(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_model.py b/client/ayon_core/hosts/maya/plugins/create/create_model.py index 5c3dd04af0..67e6b87190 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_model.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_model.py @@ -1,5 +1,5 @@ -from openpype.hosts.maya.api import plugin -from openpype.lib import ( +from ayon_core.hosts.maya.api import plugin +from ayon_core.lib import ( BoolDef, TextDef ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py b/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py index 8f5c423202..b9bb6545d6 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py @@ -5,16 +5,16 @@ from ayon_api import ( ) from maya import cmds # noqa: F401 -from openpype import AYON_SERVER_ENABLED -from openpype.client import get_assets -from openpype.hosts.maya.api import plugin -from openpype.lib import BoolDef, EnumDef, TextDef -from openpype.pipeline import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import get_assets +from ayon_core.hosts.maya.api import plugin +from ayon_core.lib import BoolDef, EnumDef, TextDef +from ayon_core.pipeline import ( Creator, get_current_asset_name, get_current_project_name, ) -from openpype.pipeline.create import CreatorError +from ayon_core.pipeline.create import CreatorError class CreateMultishotLayout(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py index f27eb57fc1..11e13b2748 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py @@ -1,5 +1,5 @@ -from openpype.hosts.maya.api import plugin -from openpype.lib import ( +from ayon_core.hosts.maya.api import plugin +from ayon_core.lib import ( BoolDef, EnumDef ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py index 2963d4d5b6..af0ffa9f23 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py @@ -1,5 +1,5 @@ -from openpype.hosts.maya.api import plugin, lib -from openpype.lib import ( +from ayon_core.hosts.maya.api import plugin, lib +from ayon_core.lib import ( BoolDef, NumberDef, TextDef, diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py index 66ddd83eda..202fbbcbc8 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py @@ -1,5 +1,5 @@ -from openpype.hosts.maya.api import plugin, lib -from openpype.lib import ( +from ayon_core.hosts.maya.api import plugin, lib +from ayon_core.lib import ( BoolDef, NumberDef, EnumDef diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py index 166dbf6515..cca2b54392 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py @@ -1,5 +1,5 @@ -from openpype.hosts.maya.api import plugin, lib -from openpype.lib import ( +from ayon_core.hosts.maya.api import plugin, lib +from ayon_core.lib import ( BoolDef, NumberDef, EnumDef diff --git a/client/ayon_core/hosts/maya/plugins/create/create_pointcache.py b/client/ayon_core/hosts/maya/plugins/create/create_pointcache.py index f4e8cbfc9a..832e0bfbc5 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_pointcache.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_pointcache.py @@ -1,10 +1,10 @@ from maya import cmds -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( lib, plugin ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef, TextDef ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py b/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py index d89470ebee..8b8cedd7ab 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py @@ -1,8 +1,8 @@ -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( lib, plugin ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef, TextDef ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py b/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py index 2490738e8f..72c86a0b74 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """Creator of Redshift proxy subset types.""" -from openpype.hosts.maya.api import plugin, lib -from openpype.lib import BoolDef +from ayon_core.hosts.maya.api import plugin, lib +from ayon_core.lib import BoolDef class CreateRedshiftProxy(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_render.py b/client/ayon_core/hosts/maya/plugins/create/create_render.py index 6266689af4..f537f249cd 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_render.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_render.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- """Create ``Render`` instance in Maya.""" -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( lib_rendersettings, plugin ) -from openpype.pipeline import CreatorError -from openpype.lib import ( +from ayon_core.pipeline import CreatorError +from ayon_core.lib import ( BoolDef, NumberDef, ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py b/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py index dd64a0a842..dc47325a34 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py @@ -1,5 +1,5 @@ -from openpype.hosts.maya.api import plugin -from openpype.pipeline import CreatorError +from ayon_core.hosts.maya.api import plugin +from ayon_core.pipeline import CreatorError class CreateRenderSetup(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_review.py b/client/ayon_core/hosts/maya/plugins/create/create_review.py index 18d661b186..074ee4dbd8 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_review.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_review.py @@ -2,18 +2,18 @@ import json from maya import cmds -from openpype import AYON_SERVER_ENABLED -from openpype.hosts.maya.api import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.hosts.maya.api import ( lib, plugin ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef, NumberDef, EnumDef ) -from openpype.pipeline import CreatedInstance -from openpype.client import get_asset_by_name +from ayon_core.pipeline import CreatedInstance +from ayon_core.client import get_asset_by_name TRANSPARENCIES = [ "preset", diff --git a/client/ayon_core/hosts/maya/plugins/create/create_rig.py b/client/ayon_core/hosts/maya/plugins/create/create_rig.py index acd5c98f89..e49e3040ba 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_rig.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_rig.py @@ -1,6 +1,6 @@ from maya import cmds -from openpype.hosts.maya.api import plugin +from ayon_core.hosts.maya.api import plugin class CreateRig(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_setdress.py b/client/ayon_core/hosts/maya/plugins/create/create_setdress.py index 23a706380a..dfc38f5d76 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_setdress.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_setdress.py @@ -1,5 +1,5 @@ -from openpype.hosts.maya.api import plugin -from openpype.lib import BoolDef +from ayon_core.hosts.maya.api import plugin +from ayon_core.lib import BoolDef class CreateSetDress(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py b/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py index b4151bac99..550a9cdb0f 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator for Unreal Skeletal Meshes.""" -from openpype.hosts.maya.api import plugin, lib -from openpype.lib import ( +from ayon_core.hosts.maya.api import plugin, lib +from ayon_core.lib import ( BoolDef, TextDef ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py b/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py index 025b39fa55..d1fac03bdf 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator for Unreal Static Meshes.""" -from openpype.hosts.maya.api import plugin, lib +from ayon_core.hosts.maya.api import plugin, lib from maya import cmds # noqa diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py b/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py index c9f9cd9ba8..4cd7288cfc 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py @@ -1,8 +1,8 @@ -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( lib, plugin ) -from openpype.lib import NumberDef +from ayon_core.lib import NumberDef class CreateYetiCache(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py b/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py index b0a95538e1..7d16c5bc2c 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py @@ -1,8 +1,8 @@ -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( plugin, lib ) -from openpype.lib import BoolDef +from ayon_core.lib import BoolDef class CreateVrayProxy(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py b/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py index 2726979d30..3642f5f689 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- """Create instance of vrayscene.""" -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( lib_rendersettings, plugin ) -from openpype.pipeline import CreatorError -from openpype.lib import BoolDef +from ayon_core.pipeline import CreatorError +from ayon_core.lib import BoolDef class CreateVRayScene(plugin.RenderlayerCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_workfile.py b/client/ayon_core/hosts/maya/plugins/create/create_workfile.py index 198f9c4a36..2ba65cd5d8 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_workfile.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_workfile.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- """Creator plugin for creating workfiles.""" -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import CreatedInstance, AutoCreator -from openpype.client import get_asset_by_name, get_asset_name_identifier -from openpype.hosts.maya.api import plugin +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import CreatedInstance, AutoCreator +from ayon_core.client import get_asset_by_name, get_asset_name_identifier +from ayon_core.hosts.maya.api import plugin from maya import cmds diff --git a/client/ayon_core/hosts/maya/plugins/create/create_xgen.py b/client/ayon_core/hosts/maya/plugins/create/create_xgen.py index eaafb0959a..4e0d41b689 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_xgen.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_xgen.py @@ -1,4 +1,4 @@ -from openpype.hosts.maya.api import plugin +from ayon_core.hosts.maya.api import plugin class CreateXgen(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py b/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py index ca002392d4..82b18f113a 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py @@ -1,8 +1,8 @@ -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( lib, plugin ) -from openpype.lib import NumberDef +from ayon_core.lib import NumberDef class CreateYetiCache(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py b/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py index 445bcf46d8..df3c89a64d 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py +++ b/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py @@ -1,6 +1,6 @@ from maya import cmds -from openpype.hosts.maya.api import ( +from ayon_core.hosts.maya.api import ( lib, plugin ) diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py b/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py index 03154b7afe..13c9de4693 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py +++ b/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py @@ -1,7 +1,7 @@ from maya import cmds -from openpype.pipeline import InventoryAction, get_representation_context -from openpype.hosts.maya.api.lib import get_id +from ayon_core.pipeline import InventoryAction, get_representation_context +from ayon_core.hosts.maya.api.lib import get_id class ConnectGeometry(InventoryAction): diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py b/client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py index 177971f176..2a198addf2 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py +++ b/client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py @@ -1,7 +1,7 @@ from maya import cmds import xgenm -from openpype.pipeline import ( +from ayon_core.pipeline import ( InventoryAction, get_representation_context, get_representation_path ) diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py b/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py index 924a1a4627..19498e5c1c 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py +++ b/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py @@ -4,10 +4,10 @@ from collections import defaultdict from maya import cmds -from openpype.pipeline import ( +from ayon_core.pipeline import ( InventoryAction, get_representation_context, get_representation_path ) -from openpype.hosts.maya.api.lib import get_container_members, get_id +from ayon_core.hosts.maya.api.lib import get_container_members, get_id class ConnectYetiRig(InventoryAction): diff --git a/client/ayon_core/hosts/maya/plugins/inventory/import_modelrender.py b/client/ayon_core/hosts/maya/plugins/inventory/import_modelrender.py index 3b30695146..e2cac22836 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/import_modelrender.py +++ b/client/ayon_core/hosts/maya/plugins/inventory/import_modelrender.py @@ -1,16 +1,16 @@ import re import json -from openpype.client import ( +from ayon_core.client import ( get_representation_by_id, get_representations ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( InventoryAction, get_representation_context, get_current_project_name, ) -from openpype.hosts.maya.api.lib import ( +from ayon_core.hosts.maya.api.lib import ( maintained_selection, apply_shaders ) diff --git a/client/ayon_core/hosts/maya/plugins/inventory/import_reference.py b/client/ayon_core/hosts/maya/plugins/inventory/import_reference.py index 3f3b85ba6c..771cb96a57 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/import_reference.py +++ b/client/ayon_core/hosts/maya/plugins/inventory/import_reference.py @@ -1,7 +1,7 @@ from maya import cmds -from openpype.pipeline import InventoryAction -from openpype.hosts.maya.api.lib import get_reference_node +from ayon_core.pipeline import InventoryAction +from ayon_core.hosts.maya.api.lib import get_reference_node class ImportReference(InventoryAction): diff --git a/client/ayon_core/hosts/maya/plugins/inventory/rig_recreate_animation_instance.py b/client/ayon_core/hosts/maya/plugins/inventory/rig_recreate_animation_instance.py index 39bc59fbbf..36d9864e99 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/rig_recreate_animation_instance.py +++ b/client/ayon_core/hosts/maya/plugins/inventory/rig_recreate_animation_instance.py @@ -1,8 +1,8 @@ -from openpype.pipeline import ( +from ayon_core.pipeline import ( InventoryAction, get_representation_context ) -from openpype.hosts.maya.api.lib import ( +from ayon_core.hosts.maya.api.lib import ( create_rig_animation_instance, get_container_members, ) diff --git a/client/ayon_core/hosts/maya/plugins/inventory/select_containers.py b/client/ayon_core/hosts/maya/plugins/inventory/select_containers.py index f85bf17ab0..f0bb2fc376 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/select_containers.py +++ b/client/ayon_core/hosts/maya/plugins/inventory/select_containers.py @@ -1,7 +1,7 @@ from maya import cmds -from openpype.pipeline import InventoryAction, registered_host -from openpype.hosts.maya.api.lib import get_container_members +from ayon_core.pipeline import InventoryAction, registered_host +from ayon_core.hosts.maya.api.lib import get_container_members class SelectInScene(InventoryAction): diff --git a/client/ayon_core/hosts/maya/plugins/load/_load_animation.py b/client/ayon_core/hosts/maya/plugins/load/_load_animation.py index 0781735bc4..8eb912218d 100644 --- a/client/ayon_core/hosts/maya/plugins/load/_load_animation.py +++ b/client/ayon_core/hosts/maya/plugins/load/_load_animation.py @@ -1,4 +1,4 @@ -import openpype.hosts.maya.api.plugin +import ayon_core.hosts.maya.api.plugin import maya.cmds as cmds @@ -14,7 +14,7 @@ def _process_reference(file_url, name, namespace, options): Returns: list: list of object nodes """ - from openpype.hosts.maya.api.lib import unique_namespace + from ayon_core.hosts.maya.api.lib import unique_namespace # Get name from asset being loaded # Assuming name is subset name from the animation, we split the number # suffix from the name to ensure the namespace is unique diff --git a/client/ayon_core/hosts/maya/plugins/load/actions.py b/client/ayon_core/hosts/maya/plugins/load/actions.py index d347ef0d08..4a81c5255c 100644 --- a/client/ayon_core/hosts/maya/plugins/load/actions.py +++ b/client/ayon_core/hosts/maya/plugins/load/actions.py @@ -2,12 +2,12 @@ """ import qargparse -from openpype.pipeline import load -from openpype.hosts.maya.api.lib import ( +from ayon_core.pipeline import load +from ayon_core.hosts.maya.api.lib import ( maintained_selection, get_custom_namespace ) -import openpype.hosts.maya.api.plugin +import ayon_core.hosts.maya.api.plugin class SetFrameRangeLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py b/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py index 2e1329f201..c690d1c205 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py @@ -3,19 +3,19 @@ import clique import maya.cmds as cmds -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( load, legacy_io, get_representation_path ) -from openpype.hosts.maya.api.lib import ( +from ayon_core.hosts.maya.api.lib import ( unique_namespace, get_attribute_input, maintained_selection, convert_to_maya_fps ) -from openpype.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api.pipeline import containerise def is_sequence(files): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_assembly.py b/client/ayon_core/hosts/maya/plugins/load/load_assembly.py index 0a2733e03c..e119dfe1c3 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_assembly.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_assembly.py @@ -1,13 +1,13 @@ import maya.cmds as cmds -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, remove_container ) -from openpype.hosts.maya.api.pipeline import containerise -from openpype.hosts.maya.api.lib import unique_namespace -from openpype.hosts.maya.api import setdress +from ayon_core.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api.lib import unique_namespace +from ayon_core.hosts.maya.api import setdress class AssemblyLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_audio.py b/client/ayon_core/hosts/maya/plugins/load/load_audio.py index 90cadb31b1..deeeac66f2 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_audio.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_audio.py @@ -1,11 +1,11 @@ from maya import cmds, mel -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.hosts.maya.api.pipeline import containerise -from openpype.hosts.maya.api.lib import unique_namespace, get_container_members +from ayon_core.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api.lib import unique_namespace, get_container_members class AudioLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py b/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py index 344f2fd060..00a76d374b 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py @@ -2,13 +2,13 @@ import os import maya.cmds as cmds -from openpype.hosts.maya.api.pipeline import containerise -from openpype.hosts.maya.api.lib import unique_namespace -from openpype.pipeline import ( +from ayon_core.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api.lib import unique_namespace +from ayon_core.pipeline import ( load, get_representation_path ) -from openpype.settings import get_project_settings +from ayon_core.settings import get_project_settings class GpuCacheLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_image.py b/client/ayon_core/hosts/maya/plugins/load/load_image.py index 27c9ec7118..aedeb63e3d 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_image.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_image.py @@ -1,22 +1,22 @@ import os import copy -from openpype.lib import EnumDef -from openpype.pipeline import ( +from ayon_core.lib import EnumDef +from ayon_core.pipeline import ( load, get_representation_context, get_current_host_name, ) -from openpype.pipeline.load.utils import get_representation_path_from_context -from openpype.pipeline.colorspace import ( +from ayon_core.pipeline.load.utils import get_representation_path_from_context +from ayon_core.pipeline.colorspace import ( get_imageio_file_rules_colorspace_from_filepath, get_imageio_config, get_imageio_file_rules ) -from openpype.settings import get_project_settings +from ayon_core.settings import get_project_settings -from openpype.hosts.maya.api.pipeline import containerise -from openpype.hosts.maya.api.lib import ( +from ayon_core.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api.lib import ( unique_namespace, namespaced ) diff --git a/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py b/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py index 117f4f4202..fb27e6597a 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py @@ -1,17 +1,17 @@ from qtpy import QtWidgets, QtCore -from openpype.client import ( +from ayon_core.client import ( get_asset_by_id, get_subset_by_id, get_version_by_id, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, get_current_project_name, ) -from openpype.hosts.maya.api.pipeline import containerise -from openpype.hosts.maya.api.lib import ( +from ayon_core.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api.lib import ( unique_namespace, namespaced, pairwise, diff --git a/client/ayon_core/hosts/maya/plugins/load/load_look.py b/client/ayon_core/hosts/maya/plugins/load/load_look.py index 20617c77bf..d1b8b971ca 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_look.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_look.py @@ -5,16 +5,16 @@ from collections import defaultdict from qtpy import QtWidgets -from openpype.client import get_representation_by_name -from openpype.pipeline import ( +from ayon_core.client import get_representation_by_name +from ayon_core.pipeline import ( get_current_project_name, get_representation_path, ) -import openpype.hosts.maya.api.plugin -from openpype.hosts.maya.api import lib -from openpype.widgets.message_window import ScrollMessageBox +import ayon_core.hosts.maya.api.plugin +from ayon_core.hosts.maya.api import lib +from ayon_core.widgets.message_window import ScrollMessageBox -from openpype.hosts.maya.api.lib import get_reference_node +from ayon_core.hosts.maya.api.lib import get_reference_node class LookLoader(openpype.hosts.maya.api.plugin.ReferenceLoader): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_matchmove.py b/client/ayon_core/hosts/maya/plugins/load/load_matchmove.py index 46d1be8300..885d2dbae1 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_matchmove.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_matchmove.py @@ -1,5 +1,5 @@ from maya import mel -from openpype.pipeline import load +from ayon_core.pipeline import load class MatchmoveLoader(load.LoaderPlugin): """ diff --git a/client/ayon_core/hosts/maya/plugins/load/load_maya_usd.py b/client/ayon_core/hosts/maya/plugins/load/load_maya_usd.py index 2fb1a625a5..c2bea1501c 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_maya_usd.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_maya_usd.py @@ -1,16 +1,16 @@ # -*- coding: utf-8 -*- import maya.cmds as cmds -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.pipeline.load import get_representation_path_from_context -from openpype.hosts.maya.api.lib import ( +from ayon_core.pipeline.load import get_representation_path_from_context +from ayon_core.hosts.maya.api.lib import ( namespaced, unique_namespace ) -from openpype.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api.pipeline import containerise class MayaUsdLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd.py b/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd.py index cad42b55f9..a9ba2b8773 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd.py @@ -3,17 +3,17 @@ import maya.cmds as cmds from maya import mel import os -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path ) -from openpype.hosts.maya.api.lib import ( +from ayon_core.hosts.maya.api.lib import ( maintained_selection, namespaced, unique_namespace ) -from openpype.hosts.maya.api.pipeline import containerise -from openpype.client import get_representation_by_id +from ayon_core.hosts.maya.api.pipeline import containerise +from ayon_core.client import get_representation_by_id class MultiverseUsdLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd_over.py b/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd_over.py index be8d78607b..d448dc74a8 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd_over.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd_over.py @@ -5,15 +5,15 @@ import os import qargparse -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path ) -from openpype.hosts.maya.api.lib import ( +from ayon_core.hosts.maya.api.lib import ( maintained_selection ) -from openpype.hosts.maya.api.pipeline import containerise -from openpype.client import get_representation_by_id +from ayon_core.hosts.maya.api.pipeline import containerise +from ayon_core.client import get_representation_by_id class MultiverseUsdOverLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py b/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py index 40385f34d6..dd378602c9 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py @@ -5,17 +5,17 @@ import clique import maya.cmds as cmds -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( load, get_representation_path ) -from openpype.hosts.maya.api.lib import ( +from ayon_core.hosts.maya.api.lib import ( namespaced, maintained_selection, unique_namespace ) -from openpype.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api.pipeline import containerise class RedshiftProxyLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_reference.py b/client/ayon_core/hosts/maya/plugins/load/load_reference.py index a4ab6c79c1..1d85e1d901 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_reference.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_reference.py @@ -5,9 +5,9 @@ import contextlib from maya import cmds import qargparse -from openpype.settings import get_project_settings -import openpype.hosts.maya.api.plugin -from openpype.hosts.maya.api.lib import ( +from ayon_core.settings import get_project_settings +import ayon_core.hosts.maya.api.plugin +from ayon_core.hosts.maya.api.lib import ( maintained_selection, get_container_members, parent_nodes, diff --git a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py b/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py index 8b85f11958..e77e270663 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py @@ -10,12 +10,12 @@ import json import sys import six -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path ) -from openpype.hosts.maya.api import lib -from openpype.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api import lib +from ayon_core.hosts.maya.api.pipeline import containerise from maya import cmds import maya.app.renderSetup.model.renderSetup as renderSetup @@ -35,7 +35,7 @@ class RenderSetupLoader(load.LoaderPlugin): def load(self, context, name, namespace, data): """Load RenderSetup settings.""" - # from openpype.hosts.maya.api.lib import namespaced + # from ayon_core.hosts.maya.api.lib import namespaced asset = context['asset']['name'] namespace = namespace or lib.unique_namespace( diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py index 0f674a69c4..98f98330d7 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py @@ -1,7 +1,7 @@ import os -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( load, get_representation_path ) @@ -21,8 +21,8 @@ class LoadVDBtoArnold(load.LoaderPlugin): def load(self, context, name, namespace, data): from maya import cmds - from openpype.hosts.maya.api.pipeline import containerise - from openpype.hosts.maya.api.lib import unique_namespace + from ayon_core.hosts.maya.api.pipeline import containerise + from ayon_core.hosts.maya.api.lib import unique_namespace try: family = context["representation"]["context"]["family"] diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py index 28cfdc7129..426e85cf7c 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py @@ -1,7 +1,7 @@ import os -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( load, get_representation_path ) @@ -27,8 +27,8 @@ class LoadVDBtoRedShift(load.LoaderPlugin): def load(self, context, name=None, namespace=None, data=None): from maya import cmds - from openpype.hosts.maya.api.pipeline import containerise - from openpype.hosts.maya.api.lib import unique_namespace + from ayon_core.hosts.maya.api.pipeline import containerise + from ayon_core.hosts.maya.api.lib import unique_namespace try: family = context["representation"]["context"]["family"] diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py index 46f2dd674d..ca0519900b 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py @@ -1,7 +1,7 @@ import os -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( load, get_representation_path ) @@ -85,8 +85,8 @@ class LoadVDBtoVRay(load.LoaderPlugin): def load(self, context, name, namespace, data): - from openpype.hosts.maya.api.lib import unique_namespace - from openpype.hosts.maya.api.pipeline import containerise + from ayon_core.hosts.maya.api.lib import unique_namespace + from ayon_core.hosts.maya.api.pipeline import containerise path = self.filepath_from_context(context) assert os.path.exists(path), ( @@ -166,7 +166,7 @@ class LoadVDBtoVRay(load.LoaderPlugin): def _set_path(self, grid_node, path, show_preset_popup=True): - from openpype.hosts.maya.api.lib import attribute_values + from ayon_core.hosts.maya.api.lib import attribute_values from maya import cmds def _get_filename_from_folder(path): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py b/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py index 9d926a33ed..9b36303b64 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py @@ -9,19 +9,19 @@ import os import maya.cmds as cmds -from openpype.client import get_representation_by_name -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core.client import get_representation_by_name +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( load, get_current_project_name, get_representation_path, ) -from openpype.hosts.maya.api.lib import ( +from ayon_core.hosts.maya.api.lib import ( maintained_selection, namespaced, unique_namespace ) -from openpype.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api.pipeline import containerise class VRayProxyLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py b/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py index 3a2c3a47f2..92d2b32549 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py @@ -1,17 +1,17 @@ # -*- coding: utf-8 -*- import os import maya.cmds as cmds # noqa -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( load, get_representation_path ) -from openpype.hosts.maya.api.lib import ( +from ayon_core.hosts.maya.api.lib import ( maintained_selection, namespaced, unique_namespace ) -from openpype.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api.pipeline import containerise class VRaySceneLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_xgen.py b/client/ayon_core/hosts/maya/plugins/load/load_xgen.py index 2ad6ad55bc..648a2f02dd 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_xgen.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_xgen.py @@ -6,15 +6,15 @@ import xgenm from qtpy import QtWidgets -import openpype.hosts.maya.api.plugin -from openpype.hosts.maya.api.lib import ( +import ayon_core.hosts.maya.api.plugin +from ayon_core.hosts.maya.api.lib import ( maintained_selection, get_container_members, attribute_values, write_xgen_file ) -from openpype.hosts.maya.api import current_file -from openpype.pipeline import get_representation_path +from ayon_core.hosts.maya.api import current_file +from ayon_core.pipeline import get_representation_path class XgenLoader(openpype.hosts.maya.api.plugin.ReferenceLoader): diff --git a/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py b/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py index 4a11ea9a2c..d2fc1c0ab0 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py @@ -6,13 +6,13 @@ from collections import defaultdict import clique from maya import cmds -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( load, get_representation_path ) -from openpype.hosts.maya.api import lib -from openpype.hosts.maya.api.pipeline import containerise +from ayon_core.hosts.maya.api import lib +from ayon_core.hosts.maya.api.pipeline import containerise # Do not reset these values on update but only apply on first load diff --git a/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py b/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py index 6cfcffe27d..26179a0ac9 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py +++ b/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py @@ -1,8 +1,8 @@ import maya.cmds as cmds -from openpype.settings import get_current_project_settings -import openpype.hosts.maya.api.plugin -from openpype.hosts.maya.api import lib +from ayon_core.settings import get_current_project_settings +import ayon_core.hosts.maya.api.plugin +from ayon_core.hosts.maya.api import lib class YetiRigLoader(openpype.hosts.maya.api.plugin.ReferenceLoader): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py b/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py index 90079c715a..2d621353e6 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py @@ -1,7 +1,7 @@ from maya import cmds import pyblish.api -from openpype.hosts.maya.api.lib import get_all_children +from ayon_core.hosts.maya.api.lib import get_all_children class CollectArnoldSceneSource(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_assembly.py b/client/ayon_core/hosts/maya/plugins/publish/collect_assembly.py index f64d6bee44..eebbbd4447 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_assembly.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_assembly.py @@ -2,8 +2,8 @@ from collections import defaultdict import pyblish.api from maya import cmds, mel -from openpype.hosts.maya import api -from openpype.hosts.maya.api import lib +from ayon_core.hosts.maya import api +from ayon_core.hosts.maya.api import lib # TODO : Publish of assembly: -unique namespace for all assets, VALIDATOR! diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_fbx_animation.py b/client/ayon_core/hosts/maya/plugins/publish/collect_fbx_animation.py index aef8765e9c..d8fd7a16e8 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_fbx_animation.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_fbx_animation.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from maya import cmds # noqa import pyblish.api -from openpype.pipeline import OptionalPyblishPluginMixin +from ayon_core.pipeline import OptionalPyblishPluginMixin class CollectFbxAnimation(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py b/client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py index 30ed21da9c..d0b1029a03 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py @@ -4,9 +4,9 @@ from maya import cmds import maya.api.OpenMaya as om import pyblish.api -from openpype.pipeline import registered_host -from openpype.hosts.maya.api.lib import get_container_members -from openpype.hosts.maya.api.lib_rendersetup import get_shader_in_layer +from ayon_core.pipeline import registered_host +from ayon_core.hosts.maya.api.lib import get_container_members +from ayon_core.hosts.maya.api.lib_rendersetup import get_shader_in_layer def iter_history(nodes, diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py b/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py index 5058da3d01..0b29851db0 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py @@ -1,7 +1,7 @@ from maya import cmds import pyblish.api -from openpype.hosts.maya.api.lib import get_all_children +from ayon_core.hosts.maya.api.lib import get_all_children class CollectNewInstances(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_look.py b/client/ayon_core/hosts/maya/plugins/publish/collect_look.py index 72682f7800..00e1855b19 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_look.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_look.py @@ -6,7 +6,7 @@ import glob from maya import cmds # noqa import pyblish.api -from openpype.hosts.maya.api import lib +from ayon_core.hosts.maya.api import lib SHAPE_ATTRS = ["castsShadows", "receiveShadows", diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py b/client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py index bcb979edfc..31c0d0eaa1 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py @@ -4,7 +4,7 @@ import re from maya import cmds import pyblish.api -from openpype.hosts.maya.api import lib +from ayon_core.hosts.maya.api import lib SHAPE_ATTRS = ["castsShadows", "receiveShadows", diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_render.py b/client/ayon_core/hosts/maya/plugins/publish/collect_render.py index 886c2b4caa..e4221a091c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_render.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_render.py @@ -47,13 +47,13 @@ from maya import cmds import pyblish.api -from openpype.pipeline import KnownPublishError -from openpype.lib import get_formatted_current_time -from openpype.hosts.maya.api.lib_renderproducts import ( +from ayon_core.pipeline import KnownPublishError +from ayon_core.lib import get_formatted_current_time +from ayon_core.hosts.maya.api.lib_renderproducts import ( get as get_layer_render_products, UnsupportedRendererException ) -from openpype.hosts.maya.api import lib +from ayon_core.hosts.maya.api import lib class CollectMayaRender(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py b/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py index 035c531a9b..585eca5dce 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py @@ -2,7 +2,7 @@ from maya import cmds import pyblish.api -from openpype.hosts.maya.api import lib +from ayon_core.hosts.maya.api import lib class CollectRenderLayerAOVS(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_renderable_camera.py b/client/ayon_core/hosts/maya/plugins/publish/collect_renderable_camera.py index 4443e2e0db..97d857079b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_renderable_camera.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_renderable_camera.py @@ -2,7 +2,7 @@ import pyblish.api from maya import cmds -from openpype.hosts.maya.api.lib_rendersetup import get_attr_in_layer +from ayon_core.hosts.maya.api.lib_rendersetup import get_attr_in_layer class CollectRenderableCamera(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_review.py b/client/ayon_core/hosts/maya/plugins/publish/collect_review.py index 0930da8f27..679a21243a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_review.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_review.py @@ -2,9 +2,9 @@ from maya import cmds, mel import pyblish.api -from openpype.client import get_subset_by_name -from openpype.pipeline import KnownPublishError -from openpype.hosts.maya.api import lib +from ayon_core.client import get_subset_by_name +from ayon_core.pipeline import KnownPublishError +from ayon_core.hosts.maya.api import lib class CollectReview(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py b/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py index b9181337a9..0efefe72c7 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py @@ -7,9 +7,9 @@ from maya import cmds import pyblish.api -from openpype.pipeline import legacy_io -from openpype.lib import get_formatted_current_time -from openpype.hosts.maya.api import lib +from ayon_core.pipeline import legacy_io +from ayon_core.lib import get_formatted_current_time +from ayon_core.hosts.maya.api import lib class CollectVrayScene(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_xgen.py b/client/ayon_core/hosts/maya/plugins/publish/collect_xgen.py index 45648e1776..f8f506376d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_xgen.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_xgen.py @@ -3,7 +3,7 @@ import os from maya import cmds import pyblish.api -from openpype.hosts.maya.api.lib import get_attribute_input +from ayon_core.hosts.maya.api.lib import get_attribute_input class CollectXgen(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_cache.py b/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_cache.py index 7a1516997a..067a7bc532 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_cache.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_cache.py @@ -2,7 +2,7 @@ from maya import cmds import pyblish.api -from openpype.hosts.maya.api import lib +from ayon_core.hosts.maya.api import lib SETTINGS = { diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_rig.py b/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_rig.py index f82f7b69cd..8964e17f14 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_rig.py +++ b/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_rig.py @@ -5,8 +5,8 @@ from maya import cmds import pyblish.api -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import KnownPublishError +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import KnownPublishError SETTINGS = {"renderDensity", diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_active_view_thumbnail.py b/client/ayon_core/hosts/maya/plugins/publish/extract_active_view_thumbnail.py index 483ae6d9d3..b5054b4846 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_active_view_thumbnail.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_active_view_thumbnail.py @@ -4,7 +4,7 @@ import maya.api.OpenMayaUI as omui import pyblish.api import tempfile -from openpype.hosts.maya.api.lib import IS_HEADLESS +from ayon_core.hosts.maya.api.lib import IS_HEADLESS class ExtractActiveViewThumbnail(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py b/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py index 46cc9090bb..ed8f2ad40c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py @@ -5,8 +5,8 @@ import json from maya import cmds import arnold -from openpype.pipeline import publish -from openpype.hosts.maya.api import lib +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api import lib class ExtractArnoldSceneSource(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_assembly.py b/client/ayon_core/hosts/maya/plugins/publish/extract_assembly.py index 86ffdcef24..2c23f9b752 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_assembly.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_assembly.py @@ -1,8 +1,8 @@ import os import json -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import extract_alembic +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import extract_alembic from maya import cmds diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py index 43803743bc..b9561e299e 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py @@ -2,8 +2,8 @@ import os from maya import cmds -from openpype.pipeline import publish -from openpype.hosts.maya.api import lib +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api import lib class ExtractCameraAlembic(publish.Extractor, diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py index f67e9db14f..8ca1fd9d3a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py @@ -6,9 +6,9 @@ import contextlib from maya import cmds -from openpype.pipeline import publish -from openpype.hosts.maya.api import lib -from openpype.lib import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api import lib +from ayon_core.lib import ( BoolDef ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx.py b/client/ayon_core/hosts/maya/plugins/publish/extract_fbx.py index 4f7eaf57bf..bb2a6dad07 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_fbx.py @@ -5,9 +5,9 @@ from maya import cmds # noqa import maya.mel as mel # noqa import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import maintained_selection -from openpype.hosts.maya.api import fbx +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import maintained_selection +from ayon_core.hosts.maya.api import fbx class ExtractFBX(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py b/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py index 756158d4f0..ee66ed2fb7 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py @@ -4,9 +4,9 @@ import os from maya import cmds # noqa import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.maya.api import fbx -from openpype.hosts.maya.api.lib import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api import fbx +from ayon_core.hosts.maya.api.lib import ( namespaced, get_namespace, strip_namespace ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_gltf.py b/client/ayon_core/hosts/maya/plugins/publish/extract_gltf.py index 6d72d28525..ff11bf0c1f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_gltf.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_gltf.py @@ -3,9 +3,9 @@ import os from maya import cmds, mel import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.maya.api import lib -from openpype.hosts.maya.api.gltf import extract_gltf +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api import lib +from ayon_core.hosts.maya.api.gltf import extract_gltf class ExtractGLB(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_gpu_cache.py b/client/ayon_core/hosts/maya/plugins/publish/extract_gpu_cache.py index 16436c6fe4..19825b769c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_gpu_cache.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_gpu_cache.py @@ -2,7 +2,7 @@ import json from maya import cmds -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractGPUCache(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py b/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py index 1fdee28d0c..2a43a30b8d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py @@ -6,10 +6,10 @@ from maya import cmds import pyblish.api import tempfile -from openpype.lib import run_subprocess -from openpype.pipeline import publish -from openpype.pipeline.publish import OptionalPyblishPluginMixin -from openpype.hosts.maya.api import lib +from ayon_core.lib import run_subprocess +from ayon_core.pipeline import publish +from ayon_core.pipeline.publish import OptionalPyblishPluginMixin +from ayon_core.hosts.maya.api import lib class ExtractImportReference(publish.Extractor, diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_layout.py b/client/ayon_core/hosts/maya/plugins/publish/extract_layout.py index 75920b44a2..f6e663174a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_layout.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_layout.py @@ -5,8 +5,8 @@ import json from maya import cmds from maya.api import OpenMaya as om -from openpype.client import get_representation_by_id -from openpype.pipeline import publish +from ayon_core.client import get_representation_by_id +from ayon_core.pipeline import publish class ExtractLayout(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_look.py b/client/ayon_core/hosts/maya/plugins/publish/extract_look.py index 635c2c425c..d878f22e55 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_look.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_look.py @@ -15,7 +15,7 @@ import pyblish.api from maya import cmds # noqa -from openpype.lib import ( +from ayon_core.lib import ( find_executable, source_hash, run_subprocess, @@ -23,9 +23,9 @@ from openpype.lib import ( ToolNotFoundError, ) -from openpype.pipeline import legacy_io, publish, KnownPublishError -from openpype.hosts.maya.api import lib -from openpype import AYON_SERVER_ENABLED +from ayon_core.pipeline import legacy_io, publish, KnownPublishError +from ayon_core.hosts.maya.api import lib +from ayon_core import AYON_SERVER_ENABLED # Modes for transfer COPY = 1 diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py b/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py index a4f313bdf9..7d2e484c94 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py @@ -4,10 +4,10 @@ import os from maya import cmds -from openpype.hosts.maya.api.lib import maintained_selection -from openpype.pipeline import AVALON_CONTAINER_ID, publish -from openpype.pipeline.publish import OpenPypePyblishPluginMixin -from openpype.lib import BoolDef +from ayon_core.hosts.maya.api.lib import maintained_selection +from ayon_core.pipeline import AVALON_CONTAINER_ID, publish +from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.lib import BoolDef class ExtractMayaSceneRaw(publish.Extractor, OpenPypePyblishPluginMixin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_usd.py b/client/ayon_core/hosts/maya/plugins/publish/extract_maya_usd.py index 8c32ac1e39..cfaea8e479 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_usd.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_maya_usd.py @@ -6,8 +6,8 @@ import contextlib from maya import cmds import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import maintained_selection @contextlib.contextmanager diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_model.py b/client/ayon_core/hosts/maya/plugins/publish/extract_model.py index 29c952ebbc..b6ae4d537a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_model.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_model.py @@ -4,8 +4,8 @@ import os from maya import cmds -from openpype.pipeline import publish -from openpype.hosts.maya.api import lib +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api import lib class ExtractModel(publish.Extractor, diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_look.py b/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_look.py index c2bebeaee6..2dd8821b3a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_look.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_look.py @@ -2,8 +2,8 @@ import os from maya import cmds -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import maintained_selection class ExtractMultiverseLook(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd.py b/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd.py index 60185bb152..8c195c25fd 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd.py @@ -5,8 +5,8 @@ from maya import cmds from maya import mel import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import maintained_selection class ExtractMultiverseUsd(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_comp.py b/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_comp.py index 7966c4fa93..d31660d1b4 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_comp.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_comp.py @@ -2,8 +2,8 @@ import os from maya import cmds -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import maintained_selection class ExtractMultiverseUsdComposition(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_over.py b/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_over.py index e4a97db6e4..00303e604c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_over.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_over.py @@ -1,7 +1,7 @@ import os -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import maintained_selection from maya import cmds diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_obj.py b/client/ayon_core/hosts/maya/plugins/publish/extract_obj.py index ca94130d09..6ce40a8728 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_obj.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_obj.py @@ -3,8 +3,8 @@ import os from maya import cmds import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.maya.api import lib +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api import lib class ExtractObj(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py b/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py index 507229a7b3..c019d43b36 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py @@ -2,8 +2,8 @@ import os import clique -from openpype.pipeline import publish -from openpype.hosts.maya.api import lib +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api import lib from maya import cmds diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_pointcache.py b/client/ayon_core/hosts/maya/plugins/publish/extract_pointcache.py index 0cc802fa7a..f2187063fc 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_pointcache.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_pointcache.py @@ -2,8 +2,8 @@ import os from maya import cmds -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import ( extract_alembic, suspended_refresh, maintained_selection, diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_proxy_abc.py b/client/ayon_core/hosts/maya/plugins/publish/extract_proxy_abc.py index d9bec87cfd..3637a58614 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_proxy_abc.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_proxy_abc.py @@ -2,8 +2,8 @@ import os from maya import cmds -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import ( extract_alembic, suspended_refresh, maintained_selection, diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py b/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py index 7fc8760a70..5600b980d9 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py @@ -4,8 +4,8 @@ import os from maya import cmds -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import maintained_selection class ExtractRedshiftProxy(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_rendersetup.py b/client/ayon_core/hosts/maya/plugins/publish/extract_rendersetup.py index 7e21f5282e..4815033777 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_rendersetup.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_rendersetup.py @@ -2,7 +2,7 @@ import os import json import maya.app.renderSetup.model.renderSetup as renderSetup -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractRenderSetup(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py b/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py index 1ffc9a7dae..13e3d7c6b4 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py @@ -4,8 +4,8 @@ import os from maya import cmds -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import maintained_selection class ExtractRig(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_skeleton_mesh.py b/client/ayon_core/hosts/maya/plugins/publish/extract_skeleton_mesh.py index 50c1fb3bde..a6811d6a6f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_skeleton_mesh.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_skeleton_mesh.py @@ -4,9 +4,9 @@ import os from maya import cmds # noqa import pyblish.api -from openpype.pipeline import publish -from openpype.pipeline.publish import OptionalPyblishPluginMixin -from openpype.hosts.maya.api import fbx +from ayon_core.pipeline import publish +from ayon_core.pipeline.publish import OptionalPyblishPluginMixin +from ayon_core.hosts.maya.api import fbx class ExtractSkeletonMesh(publish.Extractor, diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py b/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py index 28362b355c..db26422897 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py @@ -2,8 +2,8 @@ import os import glob import tempfile -from openpype.pipeline import publish -from openpype.hosts.maya.api import lib +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api import lib class ExtractThumbnail(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_abc.py b/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_abc.py index 780ed2377c..8b88bfb9f8 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_abc.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_abc.py @@ -5,8 +5,8 @@ from contextlib import contextmanager from maya import cmds # noqa -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import ( extract_alembic, suspended_refresh, maintained_selection diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py b/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py index 4b36134694..7b44c92194 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py @@ -7,8 +7,8 @@ from maya import cmds # noqa import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.maya.api import fbx +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api import fbx @contextmanager diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_staticmesh.py b/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_staticmesh.py index 26ab0827e4..9cf8a543f4 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_staticmesh.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_staticmesh.py @@ -6,12 +6,12 @@ from maya import cmds # noqa import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import ( parent_nodes, maintained_selection ) -from openpype.hosts.maya.api import fbx +from ayon_core.hosts.maya.api import fbx class ExtractUnrealStaticMesh(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_yeticache.py b/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_yeticache.py index 963285093e..9a264959d1 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_yeticache.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_yeticache.py @@ -2,7 +2,7 @@ import os from maya import cmds -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractYetiCache(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py b/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py index 21dfcfffc5..28c6e98c33 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py @@ -2,8 +2,8 @@ import os from maya import cmds -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import maintained_selection class ExtractVRayProxy(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayscene.py b/client/ayon_core/hosts/maya/plugins/publish/extract_vrayscene.py index b0615149a9..023a15e67a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayscene.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_vrayscene.py @@ -3,9 +3,9 @@ import os import re -from openpype.pipeline import publish -from openpype.hosts.maya.api.render_setup_tools import export_in_rs_layer -from openpype.hosts.maya.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.render_setup_tools import export_in_rs_layer +from ayon_core.hosts.maya.api.lib import maintained_selection from maya import cmds diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py b/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py index 4bd01c2df2..d8b352668a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py @@ -5,9 +5,9 @@ import copy from maya import cmds import pyblish.api -from openpype.hosts.maya.api.lib import extract_alembic -from openpype.pipeline import publish -from openpype.lib import StringTemplate +from ayon_core.hosts.maya.api.lib import extract_alembic +from ayon_core.pipeline import publish +from ayon_core.lib import StringTemplate class ExtractWorkfileXgen(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_xgen.py b/client/ayon_core/hosts/maya/plugins/publish/extract_xgen.py index 8409330e49..ee864bd89b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_xgen.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_xgen.py @@ -5,11 +5,11 @@ import tempfile from maya import cmds import xgenm -from openpype.pipeline import publish -from openpype.hosts.maya.api.lib import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api.lib import ( maintained_selection, attribute_values, write_xgen_file, delete_after ) -from openpype.lib import StringTemplate +from ayon_core.lib import StringTemplate class ExtractXgen(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_cache.py b/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_cache.py index b113e02219..b9cd7a1be5 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_cache.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_cache.py @@ -3,7 +3,7 @@ import json from maya import cmds -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractYetiCache(publish.Extractor): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py b/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py index da67cb911f..7387849736 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py @@ -7,8 +7,8 @@ import contextlib from maya import cmds -from openpype.pipeline import publish -from openpype.hosts.maya.api import lib +from ayon_core.pipeline import publish +from ayon_core.hosts.maya.api import lib @contextlib.contextmanager diff --git a/client/ayon_core/hosts/maya/plugins/publish/increment_current_file_deadline.py b/client/ayon_core/hosts/maya/plugins/publish/increment_current_file_deadline.py index b5d5847e9f..a9378df8e1 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/increment_current_file_deadline.py +++ b/client/ayon_core/hosts/maya/plugins/publish/increment_current_file_deadline.py @@ -17,8 +17,8 @@ class IncrementCurrentFileDeadline(pyblish.api.ContextPlugin): def process(self, context): from maya import cmds - from openpype.lib import version_up - from openpype.pipeline.publish import get_errored_plugins_from_context + from ayon_core.lib import version_up + from ayon_core.pipeline.publish import get_errored_plugins_from_context errored_plugins = get_errored_plugins_from_context(context) if any(plugin.__name__ == "MayaSubmitDeadline" diff --git a/client/ayon_core/hosts/maya/plugins/publish/save_scene.py b/client/ayon_core/hosts/maya/plugins/publish/save_scene.py index 495c339731..eb7c06a113 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/save_scene.py +++ b/client/ayon_core/hosts/maya/plugins/publish/save_scene.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline.workfile.lock_workfile import ( +from ayon_core.pipeline.workfile.lock_workfile import ( is_workfile_lock_enabled, remove_workfile_lock ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py b/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py index 4537892d6d..c73f765274 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py @@ -1,6 +1,6 @@ import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( PublishValidationError, ValidateContentsOrder ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py b/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py index 99acdc7b8f..827d9aca90 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py @@ -1,6 +1,6 @@ import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( PublishValidationError, ValidateContentsOrder ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py b/client/ayon_core/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py index 6f5f03ab39..9d32c41119 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py @@ -1,9 +1,9 @@ import maya.cmds as cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py b/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py index 7055dc145e..92b4922492 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py b/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py index 8ce76c8d04..f50fa1ed41 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError, RepairAction ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_ass_relative_paths.py b/client/ayon_core/hosts/maya/plugins/publish/validate_ass_relative_paths.py index 49913fa42b..669708d3a6 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_ass_relative_paths.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_ass_relative_paths.py @@ -5,7 +5,7 @@ import maya.cmds as cmds from mtoa.core import createOptions import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_name.py b/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_name.py index 00588cd300..475f3ba5a1 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_name.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_name.py @@ -1,7 +1,7 @@ import pyblish.api import maya.cmds as cmds -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_namespaces.py b/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_namespaces.py index 06577f38f7..7ff84ce2e0 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_namespaces.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_namespaces.py @@ -1,6 +1,6 @@ import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_transforms.py b/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_transforms.py index a24455ebaa..06d884330d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_transforms.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_transforms.py @@ -1,8 +1,8 @@ import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import PublishValidationError, RepairAction +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import PublishValidationError, RepairAction class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin): @@ -44,7 +44,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin): @classmethod def get_invalid(cls, instance): - from openpype.hosts.maya.api import lib + from ayon_core.hosts.maya.api import lib # Get all transforms in the loaded containers container_roots = cmds.listRelatives(instance.data["nodesHierarchy"], @@ -91,7 +91,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin): from qtpy import QtWidgets - from openpype.hosts.maya.api import lib + from ayon_core.hosts.maya.api import lib # Store namespace in variable, cosmetics thingy choice = QtWidgets.QMessageBox.warning( diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py b/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py index c76d979fbf..3dfe2f4f2d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py @@ -3,8 +3,8 @@ from collections import defaultdict import pyblish.api from maya import cmds -from openpype.hosts.maya.api.lib import set_attribute -from openpype.pipeline.publish import ( +from ayon_core.hosts.maya.api.lib import set_attribute +from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError, RepairAction, ValidateContentsOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_attributes.py b/client/ayon_core/hosts/maya/plugins/publish/validate_camera_attributes.py index e5745612e9..f69d201b46 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_attributes.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_camera_attributes.py @@ -1,8 +1,8 @@ import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( PublishValidationError, ValidateContentsOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_contents.py b/client/ayon_core/hosts/maya/plugins/publish/validate_camera_contents.py index 767ac55718..4a11df5451 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_contents.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_camera_contents.py @@ -1,8 +1,8 @@ import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( PublishValidationError, ValidateContentsOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_color_sets.py b/client/ayon_core/hosts/maya/plugins/publish/validate_color_sets.py index 173fee4179..7fa1bd5dd0 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_color_sets.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_color_sets.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateMeshOrder, OptionalPyblishPluginMixin, PublishValidationError, diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_current_renderlayer_renderable.py b/client/ayon_core/hosts/maya/plugins/publish/validate_current_renderlayer_renderable.py index f072e5e323..55c4973842 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_current_renderlayer_renderable.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_current_renderlayer_renderable.py @@ -1,7 +1,7 @@ import pyblish.api from maya import cmds -from openpype.pipeline.publish import context_plugin_should_run +from ayon_core.pipeline.publish import context_plugin_should_run class ValidateCurrentRenderLayerIsRenderable(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_cycle_error.py b/client/ayon_core/hosts/maya/plugins/publish/validate_cycle_error.py index 24da091246..672389b5cd 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_cycle_error.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_cycle_error.py @@ -1,9 +1,9 @@ import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api.lib import maintained_selection -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api.lib import maintained_selection +from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py b/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py index a7043b8407..85cc606b25 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py @@ -1,13 +1,13 @@ import pyblish.api from maya import cmds -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError, OptionalPyblishPluginMixin ) -from openpype.hosts.maya.api.lib_rendersetup import ( +from ayon_core.hosts.maya.api.lib_rendersetup import ( get_attr_overrides, get_attr_in_layer, ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_material.py b/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_material.py index 3b386c3def..e610a8118c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_material.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_material.py @@ -2,11 +2,11 @@ import os from maya import cmds import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder ) -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateGLSLMaterial(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_plugin.py b/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_plugin.py index da065fcf94..e155315e4f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_plugin.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_plugin.py @@ -2,7 +2,7 @@ from maya import cmds import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py index 7234f5a025..133d9c098b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py @@ -1,6 +1,6 @@ import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py index 4222e63898..cba8a16027 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py @@ -3,9 +3,9 @@ from __future__ import absolute_import import pyblish.api -from openpype import AYON_SERVER_ENABLED -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +from ayon_core import AYON_SERVER_ENABLED +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError, diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py index 69e16efe57..4229cfeb55 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py @@ -2,7 +2,7 @@ import pyblish.api import string import six -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instancer_content.py b/client/ayon_core/hosts/maya/plugins/publish/validate_instancer_content.py index 236adfb03d..5f57b31868 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_instancer_content.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_instancer_content.py @@ -1,8 +1,8 @@ import maya.cmds as cmds import pyblish.api -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import PublishValidationError +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import PublishValidationError class ValidateInstancerContent(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instancer_frame_ranges.py b/client/ayon_core/hosts/maya/plugins/publish/validate_instancer_frame_ranges.py index 714c6229d6..be6724d7e9 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_instancer_frame_ranges.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_instancer_frame_ranges.py @@ -3,7 +3,7 @@ import re import pyblish.api -from openpype.pipeline.publish import PublishValidationError +from ayon_core.pipeline.publish import PublishValidationError def is_cache_resource(resource): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_loaded_plugin.py b/client/ayon_core/hosts/maya/plugins/publish/validate_loaded_plugin.py index eac13053db..54a3e16111 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_loaded_plugin.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_loaded_plugin.py @@ -2,7 +2,7 @@ import os import pyblish.api import maya.cmds as cmds -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairContextAction, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_contents.py b/client/ayon_core/hosts/maya/plugins/publish/validate_look_contents.py index 433d997840..818f1cc3b2 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_contents.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_look_contents.py @@ -1,6 +1,6 @@ import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( PublishValidationError, ValidateContentsOrder ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py b/client/ayon_core/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py index c3edf5f1c3..d8a9222c36 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py @@ -1,7 +1,7 @@ from maya import cmds import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, RepairContextAction, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_id_reference_edits.py b/client/ayon_core/hosts/maya/plugins/publish/validate_look_id_reference_edits.py index 5075d4050d..be0c1c7e1f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_id_reference_edits.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_look_id_reference_edits.py @@ -2,8 +2,8 @@ from collections import defaultdict from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_no_default_shaders.py b/client/ayon_core/hosts/maya/plugins/publish/validate_look_no_default_shaders.py index 231331411b..c7522573c4 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_no_default_shaders.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_look_no_default_shaders.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_sets.py b/client/ayon_core/hosts/maya/plugins/publish/validate_look_sets.py index 657bab0479..b1624a5376 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_sets.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_look_sets.py @@ -1,7 +1,7 @@ import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_shading_group.py b/client/ayon_core/hosts/maya/plugins/publish/validate_look_shading_group.py index dbe7a70e6a..9d146d6589 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_shading_group.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_look_shading_group.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_single_shader.py b/client/ayon_core/hosts/maya/plugins/publish/validate_look_single_shader.py index acd761a944..88b793f526 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_single_shader.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_look_single_shader.py @@ -1,8 +1,8 @@ import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( PublishValidationError, ValidateContentsOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_maya_units.py b/client/ayon_core/hosts/maya/plugins/publish/validate_maya_units.py index ae6dc093a9..eca27d95da 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_maya_units.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_maya_units.py @@ -2,9 +2,9 @@ import maya.cmds as cmds import pyblish.api -import openpype.hosts.maya.api.lib as mayalib -from openpype.pipeline.context_tools import get_current_project_asset -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.lib as mayalib +from ayon_core.pipeline.context_tools import get_current_project_asset +from ayon_core.pipeline.publish import ( RepairContextAction, ValidateSceneOrder, PublishXmlValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py index bde78a98b8..edeee0704c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py @@ -1,15 +1,15 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api.lib import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api.lib import ( maintained_selection, delete_after, undo_chunk, get_attribute, set_attribute ) -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, RepairAction, ValidateMeshOrder, diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_empty.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_empty.py index c3264f3d98..4fac07bd9f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_empty.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_empty.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( RepairAction, ValidateMeshOrder, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_has_uv.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_has_uv.py index c382d1b983..3043d4568d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_has_uv.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_has_uv.py @@ -1,13 +1,13 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateMeshOrder, OptionalPyblishPluginMixin, PublishValidationError ) -from openpype.hosts.maya.api.lib import len_flattened +from ayon_core.hosts.maya.api.lib import len_flattened class ValidateMeshHasUVs(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py index f120361583..71aac47a31 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ValidateMeshOrder +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ValidateMeshOrder class ValidateMeshLaminaFaces(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_ngons.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_ngons.py index 5b67db3307..b5705e7678 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_ngons.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_ngons.py @@ -1,9 +1,9 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ValidateContentsOrder +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ValidateContentsOrder class ValidateMeshNgons(pyblish.api.Validator): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py index 48b4d0f557..2307576fc2 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateMeshOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_manifold.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_manifold.py index 6fd63fb29f..2362c9ba73 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_manifold.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_manifold.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateMeshOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py index 5ec6e5779b..04bfae649d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py @@ -1,9 +1,9 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( ValidateMeshOrder, OptionalPyblishPluginMixin, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py index 7855e79119..e9605dd867 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py @@ -2,8 +2,8 @@ from maya import cmds import maya.api.OpenMaya as om2 import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( RepairAction, ValidateMeshOrder, OptionalPyblishPluginMixin, diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py index 88e1507dd3..bc56d8ecec 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py @@ -5,8 +5,8 @@ from maya import cmds import maya.api.OpenMaya as om import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateMeshOrder, OptionalPyblishPluginMixin, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_shader_connections.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_shader_connections.py index 1db7613999..d1dcc5ec8f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_shader_connections.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_shader_connections.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( RepairAction, ValidateMeshOrder, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py index 46364735b9..99f9a19118 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py @@ -1,9 +1,9 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( RepairAction, ValidateMeshOrder, OptionalPyblishPluginMixin diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py index 116fecbcba..77e303e3ee 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( RepairAction, ValidateMeshOrder, OptionalPyblishPluginMixin diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py index 7167859444..2676aacd65 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py @@ -1,9 +1,9 @@ import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api.lib import len_flattened -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api.lib import len_flattened +from ayon_core.pipeline.publish import ( PublishValidationError, RepairAction, ValidateMeshOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py b/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py index 19373efad9..8fe5b00d92 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py @@ -1,9 +1,9 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_model_name.py b/client/ayon_core/hosts/maya/plugins/publish/validate_model_name.py index 11f59bb439..9a5c9a0ff6 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_model_name.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_model_name.py @@ -8,12 +8,12 @@ import gridfs import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.client.mongo import OpenPypeMongoConnection -from openpype.hosts.maya.api.shader_definition_editor import ( +import ayon_core.hosts.maya.api.action +from ayon_core.client.mongo import OpenPypeMongoConnection +from ayon_core.hosts.maya.api.shader_definition_editor import ( DEFINITION_FILENAME) -from openpype.pipeline import legacy_io -from openpype.pipeline.publish import ( +from ayon_core.pipeline import legacy_io +from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mvlook_contents.py b/client/ayon_core/hosts/maya/plugins/publish/validate_mvlook_contents.py index ad0fcafc56..af35e7f0a3 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mvlook_contents.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_mvlook_contents.py @@ -1,7 +1,7 @@ import os import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, OptionalPyblishPluginMixin, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_animation.py b/client/ayon_core/hosts/maya/plugins/publish/validate_no_animation.py index 9ff189cf83..e441220509 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_animation.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_no_animation.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, OptionalPyblishPluginMixin, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_default_camera.py b/client/ayon_core/hosts/maya/plugins/publish/validate_no_default_camera.py index f0aa9261f7..602a0f179a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_default_camera.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_no_default_camera.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_namespace.py b/client/ayon_core/hosts/maya/plugins/publish/validate_no_namespace.py index 13eeae5859..67d9b062e0 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_namespace.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_no_namespace.py @@ -1,13 +1,13 @@ import maya.cmds as cmds import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError ) -import openpype.hosts.maya.api.action +import ayon_core.hosts.maya.api.action def _as_report_list(values, prefix="- ", suffix="\n"): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_null_transforms.py b/client/ayon_core/hosts/maya/plugins/publish/validate_no_null_transforms.py index 187135fdf3..c33c66965e 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_null_transforms.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_no_null_transforms.py @@ -1,8 +1,8 @@ import maya.cmds as cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_unknown_nodes.py b/client/ayon_core/hosts/maya/plugins/publish/validate_no_unknown_nodes.py index 6ae634be24..04fad1b89c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_unknown_nodes.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_no_unknown_nodes.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, OptionalPyblishPluginMixin, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_vraymesh.py b/client/ayon_core/hosts/maya/plugins/publish/validate_no_vraymesh.py index 22fd1edc29..be8296a820 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_vraymesh.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_no_vraymesh.py @@ -1,6 +1,6 @@ import pyblish.api from maya import cmds -from openpype.pipeline.publish import PublishValidationError +from ayon_core.pipeline.publish import PublishValidationError def _as_report_list(values, prefix="- ", suffix="\n"): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids.py b/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids.py index 0c7d647014..5e2a5bb2b7 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids.py @@ -1,11 +1,11 @@ import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidatePipelineOrder, PublishXmlValidationError ) -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib class ValidateNodeIDs(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py b/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py index 643c970463..ac326ac5bd 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py @@ -1,9 +1,9 @@ import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( PublishValidationError, RepairAction, ValidateContentsOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_in_database.py b/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_in_database.py index f15aa2efa8..dce7cac864 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_in_database.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_in_database.py @@ -1,10 +1,10 @@ import pyblish.api -import openpype.hosts.maya.api.action -from openpype.client import get_assets -from openpype.hosts.maya.api import lib -from openpype.pipeline import legacy_io -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.client import get_assets +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline import legacy_io +from ayon_core.pipeline.publish import ( PublishValidationError, ValidatePipelineOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_related.py b/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_related.py index 52e706fec9..674f7192b9 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_related.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_related.py @@ -1,8 +1,8 @@ import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError, ValidatePipelineOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_unique.py b/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_unique.py index 61386fc939..3dd187420b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_unique.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_unique.py @@ -1,12 +1,12 @@ from collections import defaultdict import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidatePipelineOrder, PublishValidationError ) -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib class ValidateNodeIdsUnique(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_no_ghosting.py b/client/ayon_core/hosts/maya/plugins/publish/validate_node_no_ghosting.py index 0f608dab2c..fbe8fdeb2d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_no_ghosting.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_node_no_ghosting.py @@ -2,8 +2,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ValidateContentsOrder +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ValidateContentsOrder class ValidateNodeNoGhosting(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py b/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py index cb5c68e4ab..d672be6fa0 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py @@ -4,9 +4,9 @@ from maya import cmds import pyblish.api -from openpype.hosts.maya.api.lib import pairwise -from openpype.hosts.maya.api.action import SelectInvalidAction -from openpype.pipeline.publish import ( +from ayon_core.hosts.maya.api.lib import pairwise +from ayon_core.hosts.maya.api.action import SelectInvalidAction +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py b/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py index 030e41ca1f..576886072d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py @@ -4,7 +4,7 @@ import pyblish.api from maya import cmds -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( PublishValidationError, RepairAction, ValidateContentsOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_render_no_default_cameras.py b/client/ayon_core/hosts/maya/plugins/publish/validate_render_no_default_cameras.py index 9d4410186b..7ae9178c8a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_render_no_default_cameras.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_render_no_default_cameras.py @@ -2,8 +2,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError, ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_render_single_camera.py b/client/ayon_core/hosts/maya/plugins/publish/validate_render_single_camera.py index 2c0d604175..761d6002a4 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_render_single_camera.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_render_single_camera.py @@ -3,9 +3,9 @@ import re import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api.lib_rendersettings import RenderSettings -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api.lib_rendersettings import RenderSettings +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py b/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py index f8de983e06..df0e005a6b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py @@ -1,9 +1,9 @@ import pyblish.api -import openpype.hosts.maya.api.action -from openpype.client import get_subset_by_name -from openpype.pipeline import legacy_io -from openpype.pipeline.publish import PublishValidationError +import ayon_core.hosts.maya.api.action +from ayon_core.client import get_subset_by_name +from ayon_core.pipeline import legacy_io +from ayon_core.pipeline.publish import PublishValidationError class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py b/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py index f2a98eab32..ed70d81b63 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py @@ -6,13 +6,13 @@ from collections import OrderedDict from maya import cmds, mel import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError, ) -from openpype.hosts.maya.api import lib -from openpype.hosts.maya.api.lib_rendersettings import RenderSettings +from ayon_core.hosts.maya.api import lib +from ayon_core.hosts.maya.api.lib_rendersettings import RenderSettings def convert_to_int_or_float(string_value): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_resolution.py b/client/ayon_core/hosts/maya/plugins/publish/validate_resolution.py index 91b473b250..ff552f566d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_resolution.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_resolution.py @@ -1,12 +1,12 @@ import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin ) from maya import cmds -from openpype.pipeline.publish import RepairAction -from openpype.hosts.maya.api import lib -from openpype.hosts.maya.api.lib import reset_scene_resolution +from ayon_core.pipeline.publish import RepairAction +from ayon_core.hosts.maya.api import lib +from ayon_core.hosts.maya.api.lib import reset_scene_resolution class ValidateResolution(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_resources.py b/client/ayon_core/hosts/maya/plugins/publish/validate_resources.py index 7d894a2bef..725e86450d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_resources.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_resources.py @@ -2,7 +2,7 @@ import os from collections import defaultdict import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_review.py b/client/ayon_core/hosts/maya/plugins/publish/validate_review.py index 12a2e7f86f..fcfd851368 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_review.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_review.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_contents.py b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_contents.py index 106b4024e2..b88bede5cf 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_contents.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_contents.py @@ -1,7 +1,7 @@ import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( PublishValidationError, ValidateContentsOrder ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers.py b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers.py index 82248c57b3..d6d837a7fa 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers.py @@ -2,13 +2,13 @@ from maya import cmds import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, RepairAction, PublishValidationError ) -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api.lib import undo_chunk +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api.lib import undo_chunk class ValidateRigControllers(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py index 03f6a5f1ab..0771eb2422 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py @@ -2,14 +2,14 @@ from maya import cmds import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, RepairAction, PublishValidationError ) -from openpype.hosts.maya.api import lib -import openpype.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +import ayon_core.hosts.maya.api.action class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_joints_hidden.py b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_joints_hidden.py index 30d95128a2..3bb154542e 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_joints_hidden.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_joints_hidden.py @@ -2,9 +2,9 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py index 80ac0f27e6..709baf0ce4 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py @@ -2,9 +2,9 @@ import maya.cmds as cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_output_ids.py b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_output_ids.py index 343d8e6924..96ad35642a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_output_ids.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_rig_output_ids.py @@ -4,9 +4,9 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api.lib import get_id, set_id -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api.lib import get_id, set_id +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_scene_set_workspace.py b/client/ayon_core/hosts/maya/plugins/publish/validate_scene_set_workspace.py index ddcbab8931..6e68cf5d14 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_scene_set_workspace.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_scene_set_workspace.py @@ -3,7 +3,7 @@ import os import maya.cmds as cmds import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( PublishValidationError, ValidatePipelineOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_setdress_root.py b/client/ayon_core/hosts/maya/plugins/publish/validate_setdress_root.py index 5fd971f8c4..906f6fbd1a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_setdress_root.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_setdress_root.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline.publish import ValidateContentsOrder +from ayon_core.pipeline.publish import ValidateContentsOrder class ValidateSetdressRoot(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py b/client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py index d6486dea7f..9a07598ed1 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py @@ -3,8 +3,8 @@ import re import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_default_names.py b/client/ayon_core/hosts/maya/plugins/publish/validate_shape_default_names.py index d8ad366ed8..ecee035f9b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_default_names.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_shape_default_names.py @@ -4,8 +4,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, RepairAction, OptionalPyblishPluginMixin diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_render_stats.py b/client/ayon_core/hosts/maya/plugins/publish/validate_shape_render_stats.py index f58c0aaf81..10f75624d6 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_render_stats.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_shape_render_stats.py @@ -2,8 +2,8 @@ import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( RepairAction, ValidateMeshOrder, ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_zero.py b/client/ayon_core/hosts/maya/plugins/publish/validate_shape_zero.py index c7af6a60db..e4f1488c9c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_zero.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_shape_zero.py @@ -2,9 +2,9 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( ValidateContentsOrder, RepairAction, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_single_assembly.py b/client/ayon_core/hosts/maya/plugins/publish/validate_single_assembly.py index b768c9c4e8..1987f93e32 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_single_assembly.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_single_assembly.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline.publish import ValidateContentsOrder +from ayon_core.pipeline.publish import ValidateContentsOrder class ValidateSingleAssembly(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_hierarchy.py b/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_hierarchy.py index 9084374c76..ff2ad822b6 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_hierarchy.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_hierarchy.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_triangulated.py b/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_triangulated.py index 701c80a8af..cc25e769e6 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_triangulated.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_triangulated.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.hosts.maya.api.action import ( +from ayon_core.hosts.maya.api.action import ( SelectInvalidAction, ) -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skeleton_top_group_hierarchy.py b/client/ayon_core/hosts/maya/plugins/publish/validate_skeleton_top_group_hierarchy.py index 1dbe1c454c..7c876240ae 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_skeleton_top_group_hierarchy.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_skeleton_top_group_hierarchy.py @@ -4,7 +4,7 @@ from maya import cmds import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, OptionalPyblishPluginMixin, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py b/client/ayon_core/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py index b45d2b120a..fbd9887123 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py @@ -2,8 +2,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ValidateContentsOrder +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ValidateContentsOrder class ValidateSkinclusterDeformerSet(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_step_size.py b/client/ayon_core/hosts/maya/plugins/publish/validate_step_size.py index 493a6ee65c..d9e487898a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_step_size.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_step_size.py @@ -1,7 +1,7 @@ import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( PublishValidationError, ValidateContentsOrder ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py b/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py index cbc7ee9d5c..77f68a595e 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py @@ -4,8 +4,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, OptionalPyblishPluginMixin, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_zero.py b/client/ayon_core/hosts/maya/plugins/publish/validate_transform_zero.py index 906ff17ec9..63c0c9af7e 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_zero.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_transform_zero.py @@ -2,8 +2,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unique_names.py b/client/ayon_core/hosts/maya/plugins/publish/validate_unique_names.py index 05776ee0f3..faca6f912c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_unique_names.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_unique_names.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ValidateContentsOrder +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ValidateContentsOrder class ValidateUniqueNames(pyblish.api.Validator): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py b/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py index e78962bf97..1665bce274 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py @@ -3,8 +3,8 @@ from maya import cmds import pyblish.api -from openpype.pipeline.publish import ValidateMeshOrder -import openpype.hosts.maya.api.action +from ayon_core.pipeline.publish import ValidateMeshOrder +import ayon_core.hosts.maya.api.action class ValidateUnrealMeshTriangulated(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py b/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py index 42d3dc3ac8..304473369b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py @@ -4,10 +4,10 @@ import re import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline import legacy_io -from openpype.settings import get_project_settings -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline import legacy_io +from ayon_core.settings import get_project_settings +from ayon_core.pipeline.publish import ( ValidateContentsOrder, OptionalPyblishPluginMixin, PublishValidationError diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_up_axis.py b/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_up_axis.py index a420dcb900..ef7296e628 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_up_axis.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_up_axis.py @@ -3,7 +3,7 @@ from maya import cmds import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, RepairAction, OptionalPyblishPluginMixin diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py b/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py index e72782e552..3b5f90cb96 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py @@ -1,8 +1,8 @@ import pyblish.api -from openpype.hosts.maya.api.lib import iter_visible_nodes_in_range -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +from ayon_core.hosts.maya.api.lib import iter_visible_nodes_in_range +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray.py b/client/ayon_core/hosts/maya/plugins/publish/validate_vray.py index bef5967cc9..db78212658 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vray.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_vray.py @@ -1,7 +1,7 @@ from maya import cmds import pyblish.api -from openpype.pipeline.publish import PublishValidationError +from ayon_core.pipeline.publish import PublishValidationError class ValidateVray(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py b/client/ayon_core/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py index 14571203ea..54eaa58e74 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py @@ -1,8 +1,8 @@ import pyblish.api from maya import cmds -from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( +from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline.publish import ( PublishValidationError, RepairAction, ValidateContentsOrder) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py b/client/ayon_core/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py index 39c721e717..d4e53d69dc 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py @@ -4,7 +4,7 @@ import pyblish.api import types from maya import cmds -from openpype.pipeline.publish import RepairContextAction +from ayon_core.pipeline.publish import RepairContextAction class ValidateVrayReferencedAOVs(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_translator_settings.py b/client/ayon_core/hosts/maya/plugins/publish/validate_vray_translator_settings.py index 4474f08ba4..f366ee60cf 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_translator_settings.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_vray_translator_settings.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Validate VRay Translator settings.""" import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( context_plugin_should_run, RepairContextAction, ValidateContentsOrder, diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy.py b/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy.py index a106b970b4..7e16006f97 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline import KnownPublishError +from ayon_core.pipeline import KnownPublishError class ValidateVrayProxy(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy_members.py b/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy_members.py index 7b726de3a8..74d203d987 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy_members.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy_members.py @@ -2,8 +2,8 @@ import pyblish.api from maya import cmds -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_xgen.py b/client/ayon_core/hosts/maya/plugins/publish/validate_xgen.py index a44fa56308..e2c006be9f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_xgen.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_xgen.py @@ -4,7 +4,7 @@ import maya.cmds as cmds import xgenm import pyblish.api -from openpype.pipeline.publish import PublishValidationError +from ayon_core.pipeline.publish import PublishValidationError class ValidateXgen(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py b/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py index a8085418e7..a72d930339 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py @@ -1,7 +1,7 @@ from maya import cmds import pyblish.api -from openpype.pipeline.publish import ValidateContentsOrder +from ayon_core.pipeline.publish import ValidateContentsOrder class ValidateYetiRenderScriptCallbacks(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py b/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py index 2b7249ad94..8f2b3d7e5c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py @@ -1,7 +1,7 @@ import pyblish.api import maya.cmds as cmds -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( RepairAction, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py b/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py index 50a27589ad..c789f5e8a0 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py @@ -2,8 +2,8 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( +import ayon_core.hosts.maya.api.action +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_settings.py b/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_settings.py index 455bf5291a..22a5ccbaca 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_settings.py +++ b/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_settings.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import PublishValidationError +from ayon_core.pipeline.publish import PublishValidationError class ValidateYetiRigSettings(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/maya/startup/userSetup.py b/client/ayon_core/hosts/maya/startup/userSetup.py index f2899cdb37..588dd626b9 100644 --- a/client/ayon_core/hosts/maya/startup/userSetup.py +++ b/client/ayon_core/hosts/maya/startup/userSetup.py @@ -1,8 +1,8 @@ import os -from openpype.settings import get_project_settings -from openpype.pipeline import install_host, get_current_project_name -from openpype.hosts.maya.api import MayaHost +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import install_host, get_current_project_name +from ayon_core.hosts.maya.api import MayaHost from maya import cmds diff --git a/client/ayon_core/hosts/maya/tools/__init__.py b/client/ayon_core/hosts/maya/tools/__init__.py index bd1e302cd2..0dd6de2342 100644 --- a/client/ayon_core/hosts/maya/tools/__init__.py +++ b/client/ayon_core/hosts/maya/tools/__init__.py @@ -1,4 +1,4 @@ -from openpype.tools.utils.host_tools import qt_app_context +from ayon_core.tools.utils.host_tools import qt_app_context class MayaToolsSingleton: diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py index b5ce7ada34..d73c5e318f 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py +++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py @@ -4,11 +4,11 @@ import logging from qtpy import QtWidgets, QtCore -from openpype import style -from openpype.client import get_last_version_by_subset_id -from openpype.pipeline import get_current_project_name -from openpype.tools.utils.lib import qt_app_context -from openpype.hosts.maya.api.lib import ( +from ayon_core import style +from ayon_core.client import get_last_version_by_subset_id +from ayon_core.pipeline import get_current_project_name +from ayon_core.tools.utils.lib import qt_app_context +from ayon_core.hosts.maya.api.lib import ( assign_look_by_version, get_main_window ) diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py index 076b0047bb..eaca435d55 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py +++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py @@ -5,9 +5,9 @@ import logging from maya import cmds -from openpype.pipeline import legacy_io -from openpype.client import get_last_version_by_subset_name -from openpype.hosts.maya import api +from ayon_core.pipeline import legacy_io +from ayon_core.client import get_last_version_by_subset_name +from ayon_core.hosts.maya import api from . import lib from .alembic import get_alembic_ids_cache from .usd import is_usd_lib_supported, get_usd_ids_cache diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py index 86df502ecd..4d2f1a8443 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py +++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py @@ -4,13 +4,13 @@ from collections import defaultdict import maya.cmds as cmds -from openpype.client import get_assets, get_asset_name_identifier -from openpype.pipeline import ( +from ayon_core.client import get_assets, get_asset_name_identifier +from ayon_core.pipeline import ( remove_container, registered_host, get_current_project_name, ) -from openpype.hosts.maya.api import lib +from ayon_core.hosts.maya.api import lib from .vray_proxies import get_alembic_ids_cache from . import arnold_standin diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/lib.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/lib.py index fddaf6112d..a1b4e38311 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/lib.py +++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/lib.py @@ -1,7 +1,7 @@ import json import logging -from openpype.pipeline import ( +from ayon_core.pipeline import ( legacy_io, get_representation_path, registered_host, @@ -9,8 +9,8 @@ from openpype.pipeline import ( loaders_from_representation, load_container ) -from openpype.client import get_representation_by_name -from openpype.hosts.maya.api import lib +from ayon_core.client import get_representation_by_name +from ayon_core.hosts.maya.api import lib log = logging.getLogger(__name__) diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/models.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/models.py index ed6a68bee0..a252f103ec 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/models.py +++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/models.py @@ -3,8 +3,8 @@ from collections import defaultdict from qtpy import QtCore import qtawesome -from openpype.tools.utils import models -from openpype.style import get_default_entity_icon_color +from ayon_core.tools.utils import models +from ayon_core.style import get_default_entity_icon_color class AssetModel(models.TreeModel): diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py index 97fb832f71..cbd5f7fd5c 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py +++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py @@ -5,9 +5,9 @@ import logging from maya import cmds -from openpype.client import get_last_version_by_subset_name -from openpype.pipeline import get_current_project_name -import openpype.hosts.maya.lib as maya_lib +from ayon_core.client import get_last_version_by_subset_name +from ayon_core.pipeline import get_current_project_name +import ayon_core.hosts.maya.lib as maya_lib from . import lib from .alembic import get_alembic_ids_cache diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/widgets.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/widgets.py index ef29a4c726..234a1c149e 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/widgets.py +++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/widgets.py @@ -3,9 +3,9 @@ from collections import defaultdict from qtpy import QtWidgets, QtCore -from openpype.client import get_asset_name_identifier -from openpype.tools.utils.models import TreeModel -from openpype.tools.utils.lib import ( +from ayon_core.client import get_asset_name_identifier +from ayon_core.tools.utils.models import TreeModel +from ayon_core.tools.utils.lib import ( preserve_expanded_rows, preserve_selection, ) diff --git a/client/ayon_core/hosts/nuke/addon.py b/client/ayon_core/hosts/nuke/addon.py index 6a4b91a76d..4ca4408271 100644 --- a/client/ayon_core/hosts/nuke/addon.py +++ b/client/ayon_core/hosts/nuke/addon.py @@ -1,6 +1,6 @@ import os import platform -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon NUKE_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/nuke/api/actions.py b/client/ayon_core/hosts/nuke/api/actions.py index 995e6427af..a7bcb5b44f 100644 --- a/client/ayon_core/hosts/nuke/api/actions.py +++ b/client/ayon_core/hosts/nuke/api/actions.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import get_errored_instances_from_context +from ayon_core.pipeline.publish import get_errored_instances_from_context from .lib import ( reset_selection, select_nodes diff --git a/client/ayon_core/hosts/nuke/api/gizmo_menu.py b/client/ayon_core/hosts/nuke/api/gizmo_menu.py index 5838ee8a8a..435e4a5806 100644 --- a/client/ayon_core/hosts/nuke/api/gizmo_menu.py +++ b/client/ayon_core/hosts/nuke/api/gizmo_menu.py @@ -2,7 +2,7 @@ import os import re import nuke -from openpype.lib import Logger +from ayon_core.lib import Logger log = Logger.get_logger(__name__) diff --git a/client/ayon_core/hosts/nuke/api/lib.py b/client/ayon_core/hosts/nuke/api/lib.py index cdefd05c11..df4a0a8d34 100644 --- a/client/ayon_core/hosts/nuke/api/lib.py +++ b/client/ayon_core/hosts/nuke/api/lib.py @@ -13,8 +13,8 @@ from collections import OrderedDict import nuke from qtpy import QtCore, QtWidgets -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_project, get_asset_by_name, get_versions, @@ -22,36 +22,36 @@ from openpype.client import ( get_representations, ) -from openpype.host import HostDirmap -from openpype.tools.utils import host_tools -from openpype.pipeline.workfile.workfile_template_builder import ( +from ayon_core.host import HostDirmap +from ayon_core.tools.utils import host_tools +from ayon_core.pipeline.workfile.workfile_template_builder import ( TemplateProfileNotFound ) -from openpype.lib import ( +from ayon_core.lib import ( env_value_to_bool, Logger, get_version_from_path, StringTemplate, ) -from openpype.settings import ( +from ayon_core.settings import ( get_project_settings, get_current_project_settings, ) -from openpype.modules import ModulesManager -from openpype.pipeline.template_data import get_template_data_with_names -from openpype.pipeline import ( +from ayon_core.modules import ModulesManager +from ayon_core.pipeline.template_data import get_template_data_with_names +from ayon_core.pipeline import ( discover_legacy_creator_plugins, Anatomy, get_current_host_name, get_current_project_name, get_current_asset_name, ) -from openpype.pipeline.context_tools import ( +from ayon_core.pipeline.context_tools import ( get_custom_workfile_template_from_session ) -from openpype.pipeline.colorspace import get_imageio_config -from openpype.pipeline.workfile import BuildWorkfile +from ayon_core.pipeline.colorspace import get_imageio_config +from ayon_core.pipeline.workfile import BuildWorkfile from . import gizmo_menu from .constants import ASSIST @@ -360,7 +360,7 @@ def imprint(node, data, tab=None): Examples: ``` import nuke - from openpype.hosts.nuke.api import lib + from ayon_core.hosts.nuke.api import lib node = nuke.createNode("NoOp") data = { diff --git a/client/ayon_core/hosts/nuke/api/pipeline.py b/client/ayon_core/hosts/nuke/api/pipeline.py index c2fc684c21..2714607880 100644 --- a/client/ayon_core/hosts/nuke/api/pipeline.py +++ b/client/ayon_core/hosts/nuke/api/pipeline.py @@ -6,16 +6,15 @@ from collections import OrderedDict, defaultdict import pyblish.api -import openpype -from openpype.host import ( +from ayon_core.host import ( HostBase, IWorkfileHost, ILoadHost, IPublishHost ) -from openpype.settings import get_current_project_settings -from openpype.lib import register_event_callback, Logger -from openpype.pipeline import ( +from ayon_core.settings import get_current_project_settings +from ayon_core.lib import register_event_callback, Logger +from ayon_core.pipeline import ( register_loader_plugin_path, register_creator_plugin_path, register_inventory_action_path, @@ -23,8 +22,9 @@ from openpype.pipeline import ( get_current_asset_name, get_current_task_name, ) -from openpype.pipeline.workfile import BuildWorkfile -from openpype.tools.utils import host_tools +from ayon_core.pipeline.workfile import BuildWorkfile +from ayon_core.tools.utils import host_tools +from ayon_core.hosts.nuke import NUKE_ROOT_DIR from .command import viewer_update_and_undo_stop from .lib import ( @@ -67,8 +67,7 @@ from .constants import ASSIST log = Logger.get_logger(__name__) -HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.nuke.__file__)) -PLUGINS_DIR = os.path.join(HOST_DIR, "plugins") +PLUGINS_DIR = os.path.join(NUKE_ROOT_DIR, "plugins") PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") LOAD_PATH = os.path.join(PLUGINS_DIR, "load") CREATE_PATH = os.path.join(PLUGINS_DIR, "create") diff --git a/client/ayon_core/hosts/nuke/api/plugin.py b/client/ayon_core/hosts/nuke/api/plugin.py index c8301b81fd..c3a2f472ec 100644 --- a/client/ayon_core/hosts/nuke/api/plugin.py +++ b/client/ayon_core/hosts/nuke/api/plugin.py @@ -8,12 +8,12 @@ import string from collections import OrderedDict, defaultdict from abc import abstractmethod -from openpype.settings import get_current_project_settings -from openpype.lib import ( +from ayon_core.settings import get_current_project_settings +from ayon_core.lib import ( BoolDef, EnumDef ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( LegacyCreator, LoaderPlugin, CreatorError, @@ -21,12 +21,12 @@ from openpype.pipeline import ( CreatedInstance, get_current_task_name ) -from openpype.pipeline.colorspace import ( +from ayon_core.pipeline.colorspace import ( get_display_view_colorspace_name, get_colorspace_settings_from_publish_context, set_colorspace_data_to_representation ) -from openpype.lib.transcoding import ( +from ayon_core.lib.transcoding import ( VIDEO_EXTENSIONS ) from .lib import ( @@ -1220,7 +1220,7 @@ def convert_to_valid_instaces(): } return mapping[family] - from openpype.hosts.nuke.api import workio + from ayon_core.hosts.nuke.api import workio task_name = get_current_task_name() diff --git a/client/ayon_core/hosts/nuke/api/utils.py b/client/ayon_core/hosts/nuke/api/utils.py index a7df1dee71..d738ba5464 100644 --- a/client/ayon_core/hosts/nuke/api/utils.py +++ b/client/ayon_core/hosts/nuke/api/utils.py @@ -1,7 +1,7 @@ import os import nuke -from openpype import resources +from ayon_core import resources from qtpy import QtWidgets diff --git a/client/ayon_core/hosts/nuke/api/workfile_template_builder.py b/client/ayon_core/hosts/nuke/api/workfile_template_builder.py index ee9f75d10d..4c15da983e 100644 --- a/client/ayon_core/hosts/nuke/api/workfile_template_builder.py +++ b/client/ayon_core/hosts/nuke/api/workfile_template_builder.py @@ -1,7 +1,7 @@ import collections import nuke -from openpype.pipeline import registered_host -from openpype.pipeline.workfile.workfile_template_builder import ( +from ayon_core.pipeline import registered_host +from ayon_core.pipeline.workfile.workfile_template_builder import ( AbstractTemplateBuilder, PlaceholderPlugin, LoadPlaceholderItem, @@ -9,7 +9,7 @@ from openpype.pipeline.workfile.workfile_template_builder import ( PlaceholderLoadMixin, PlaceholderCreateMixin ) -from openpype.tools.workfile_template_build import ( +from ayon_core.tools.workfile_template_build import ( WorkfileBuildPlaceholderDialog, ) from .lib import ( diff --git a/client/ayon_core/hosts/nuke/hooks/pre_nukeassist_setup.py b/client/ayon_core/hosts/nuke/hooks/pre_nukeassist_setup.py index 657291ec51..2f6d121af5 100644 --- a/client/ayon_core/hosts/nuke/hooks/pre_nukeassist_setup.py +++ b/client/ayon_core/hosts/nuke/hooks/pre_nukeassist_setup.py @@ -1,4 +1,4 @@ -from openpype.lib.applications import PreLaunchHook +from ayon_core.lib.applications import PreLaunchHook class PrelaunchNukeAssistHook(PreLaunchHook): diff --git a/client/ayon_core/hosts/nuke/plugins/create/convert_legacy.py b/client/ayon_core/hosts/nuke/plugins/create/convert_legacy.py index 377e9f78f6..6c76f4824f 100644 --- a/client/ayon_core/hosts/nuke/plugins/create/convert_legacy.py +++ b/client/ayon_core/hosts/nuke/plugins/create/convert_legacy.py @@ -1,11 +1,11 @@ -from openpype.pipeline.create.creator_plugins import SubsetConvertorPlugin -from openpype.hosts.nuke.api.lib import ( +from ayon_core.pipeline.create.creator_plugins import SubsetConvertorPlugin +from ayon_core.hosts.nuke.api.lib import ( INSTANCE_DATA_KNOB, get_node_data, get_avalon_knob_data, AVALON_TAB, ) -from openpype.hosts.nuke.api.plugin import convert_to_valid_instaces +from ayon_core.hosts.nuke.api.plugin import convert_to_valid_instaces import nuke diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_backdrop.py b/client/ayon_core/hosts/nuke/plugins/create/create_backdrop.py index 52959bbef2..530392c635 100644 --- a/client/ayon_core/hosts/nuke/plugins/create/create_backdrop.py +++ b/client/ayon_core/hosts/nuke/plugins/create/create_backdrop.py @@ -1,6 +1,6 @@ from nukescripts import autoBackdrop -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( NukeCreator, maintained_selection, select_nodes diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_camera.py b/client/ayon_core/hosts/nuke/plugins/create/create_camera.py index be9c69213e..7ade19d846 100644 --- a/client/ayon_core/hosts/nuke/plugins/create/create_camera.py +++ b/client/ayon_core/hosts/nuke/plugins/create/create_camera.py @@ -1,10 +1,10 @@ import nuke -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( NukeCreator, NukeCreatorError, maintained_selection ) -from openpype.hosts.nuke.api.lib import ( +from ayon_core.hosts.nuke.api.lib import ( create_camera_node_by_version ) diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_gizmo.py b/client/ayon_core/hosts/nuke/plugins/create/create_gizmo.py index cbe2f635c9..51c5b1931b 100644 --- a/client/ayon_core/hosts/nuke/plugins/create/create_gizmo.py +++ b/client/ayon_core/hosts/nuke/plugins/create/create_gizmo.py @@ -1,5 +1,5 @@ import nuke -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( NukeCreator, NukeCreatorError, maintained_selection diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_model.py b/client/ayon_core/hosts/nuke/plugins/create/create_model.py index a94c9f0313..db927171cd 100644 --- a/client/ayon_core/hosts/nuke/plugins/create/create_model.py +++ b/client/ayon_core/hosts/nuke/plugins/create/create_model.py @@ -1,5 +1,5 @@ import nuke -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( NukeCreator, NukeCreatorError, maintained_selection diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_source.py b/client/ayon_core/hosts/nuke/plugins/create/create_source.py index 8419c3ef33..be9fa44929 100644 --- a/client/ayon_core/hosts/nuke/plugins/create/create_source.py +++ b/client/ayon_core/hosts/nuke/plugins/create/create_source.py @@ -1,13 +1,13 @@ import nuke import six import sys -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( INSTANCE_DATA_KNOB, NukeCreator, NukeCreatorError, set_node_data ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( CreatedInstance ) diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_write_image.py b/client/ayon_core/hosts/nuke/plugins/create/create_write_image.py index f21d871c9f..125cf057f8 100644 --- a/client/ayon_core/hosts/nuke/plugins/create/create_write_image.py +++ b/client/ayon_core/hosts/nuke/plugins/create/create_write_image.py @@ -2,17 +2,17 @@ import nuke import sys import six -from openpype.pipeline import ( +from ayon_core.pipeline import ( CreatedInstance ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef, NumberDef, UISeparatorDef, EnumDef ) -from openpype.hosts.nuke import api as napi -from openpype.hosts.nuke.api.plugin import exposed_write_knobs +from ayon_core.hosts.nuke import api as napi +from ayon_core.hosts.nuke.api.plugin import exposed_write_knobs class CreateWriteImage(napi.NukeWriteCreator): diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_write_prerender.py b/client/ayon_core/hosts/nuke/plugins/create/create_write_prerender.py index 742bfb20ad..371ef85a15 100644 --- a/client/ayon_core/hosts/nuke/plugins/create/create_write_prerender.py +++ b/client/ayon_core/hosts/nuke/plugins/create/create_write_prerender.py @@ -2,14 +2,14 @@ import nuke import sys import six -from openpype.pipeline import ( +from ayon_core.pipeline import ( CreatedInstance ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef ) -from openpype.hosts.nuke import api as napi -from openpype.hosts.nuke.api.plugin import exposed_write_knobs +from ayon_core.hosts.nuke import api as napi +from ayon_core.hosts.nuke.api.plugin import exposed_write_knobs class CreateWritePrerender(napi.NukeWriteCreator): diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_write_render.py b/client/ayon_core/hosts/nuke/plugins/create/create_write_render.py index fc16876f75..c5f4d5003a 100644 --- a/client/ayon_core/hosts/nuke/plugins/create/create_write_render.py +++ b/client/ayon_core/hosts/nuke/plugins/create/create_write_render.py @@ -2,14 +2,14 @@ import nuke import sys import six -from openpype.pipeline import ( +from ayon_core.pipeline import ( CreatedInstance ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef ) -from openpype.hosts.nuke import api as napi -from openpype.hosts.nuke.api.plugin import exposed_write_knobs +from ayon_core.hosts.nuke import api as napi +from ayon_core.hosts.nuke.api.plugin import exposed_write_knobs class CreateWriteRender(napi.NukeWriteCreator): diff --git a/client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py b/client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py index c4e0753abc..87f62b011e 100644 --- a/client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py +++ b/client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py @@ -1,10 +1,10 @@ -import openpype.hosts.nuke.api as api -from openpype.client import get_asset_by_name -from openpype.pipeline import ( +import ayon_core.hosts.nuke.api as api +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline import ( AutoCreator, CreatedInstance, ) -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( INSTANCE_DATA_KNOB, set_node_data ) diff --git a/client/ayon_core/hosts/nuke/plugins/inventory/repair_old_loaders.py b/client/ayon_core/hosts/nuke/plugins/inventory/repair_old_loaders.py index 764499ff0c..7bb5c8ef20 100644 --- a/client/ayon_core/hosts/nuke/plugins/inventory/repair_old_loaders.py +++ b/client/ayon_core/hosts/nuke/plugins/inventory/repair_old_loaders.py @@ -1,6 +1,6 @@ -from openpype.lib import Logger -from openpype.pipeline import InventoryAction -from openpype.hosts.nuke.api.lib import set_avalon_knob_data +from ayon_core.lib import Logger +from ayon_core.pipeline import InventoryAction +from ayon_core.hosts.nuke.api.lib import set_avalon_knob_data class RepairOldLoaders(InventoryAction): diff --git a/client/ayon_core/hosts/nuke/plugins/inventory/select_containers.py b/client/ayon_core/hosts/nuke/plugins/inventory/select_containers.py index 4e7a20fb26..2fa9c06984 100644 --- a/client/ayon_core/hosts/nuke/plugins/inventory/select_containers.py +++ b/client/ayon_core/hosts/nuke/plugins/inventory/select_containers.py @@ -1,5 +1,5 @@ -from openpype.pipeline import InventoryAction -from openpype.hosts.nuke.api.command import viewer_update_and_undo_stop +from ayon_core.pipeline import InventoryAction +from ayon_core.hosts.nuke.api.command import viewer_update_and_undo_stop class SelectContainers(InventoryAction): diff --git a/client/ayon_core/hosts/nuke/plugins/load/actions.py b/client/ayon_core/hosts/nuke/plugins/load/actions.py index 635318f53d..de51321924 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/actions.py +++ b/client/ayon_core/hosts/nuke/plugins/load/actions.py @@ -2,8 +2,8 @@ """ -from openpype.lib import Logger -from openpype.pipeline import load +from ayon_core.lib import Logger +from ayon_core.pipeline import load log = Logger.get_logger(__name__) @@ -26,7 +26,7 @@ class SetFrameRangeLoader(load.LoaderPlugin): def load(self, context, name, namespace, data): - from openpype.hosts.nuke.api import lib + from ayon_core.hosts.nuke.api import lib version = context['version'] version_data = version.get("data", {}) @@ -60,7 +60,7 @@ class SetFrameRangeWithHandlesLoader(load.LoaderPlugin): def load(self, context, name, namespace, data): - from openpype.hosts.nuke.api import lib + from ayon_core.hosts.nuke.api import lib version = context['version'] version_data = version.get("data", {}) diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py b/client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py index 54d37da203..ed512c86ab 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py @@ -1,16 +1,16 @@ import nuke import nukescripts -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_current_project_name, get_representation_path, ) -from openpype.hosts.nuke.api.lib import ( +from ayon_core.hosts.nuke.api.lib import ( find_free_space_to_paste_nodes, maintained_selection, reset_selection, @@ -18,8 +18,8 @@ from openpype.hosts.nuke.api.lib import ( get_avalon_knob_data, set_avalon_knob_data ) -from openpype.hosts.nuke.api.command import viewer_update_and_undo_stop -from openpype.hosts.nuke.api import containerise, update_container +from ayon_core.hosts.nuke.api.command import viewer_update_and_undo_stop +from ayon_core.hosts.nuke.api import containerise, update_container class LoadBackdropNodes(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py b/client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py index 898c5e4e7b..2b2fb6f938 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py @@ -1,20 +1,20 @@ import nuke -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_current_project_name, get_representation_path, ) -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( containerise, update_container, viewer_update_and_undo_stop ) -from openpype.hosts.nuke.api.lib import ( +from ayon_core.hosts.nuke.api.lib import ( maintained_selection ) diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_clip.py b/client/ayon_core/hosts/nuke/plugins/load/load_clip.py index 3a2ec3dbee..8bce2eac6e 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_clip.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_clip.py @@ -2,30 +2,30 @@ import nuke import qargparse from pprint import pformat from copy import deepcopy -from openpype.lib import Logger -from openpype.client import ( +from ayon_core.lib import Logger +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_current_project_name, get_representation_path, ) -from openpype.hosts.nuke.api.lib import ( +from ayon_core.hosts.nuke.api.lib import ( get_imageio_input_colorspace, maintained_selection ) -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( containerise, update_container, viewer_update_and_undo_stop, colorspace_exists_on_node ) -from openpype.lib.transcoding import ( +from ayon_core.lib.transcoding import ( VIDEO_EXTENSIONS, IMAGE_EXTENSIONS ) -from openpype.hosts.nuke.api import plugin +from ayon_core.hosts.nuke.api import plugin class LoadClip(plugin.NukeLoader): diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_effects.py b/client/ayon_core/hosts/nuke/plugins/load/load_effects.py index cc048372d4..0b5f31033e 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_effects.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_effects.py @@ -3,16 +3,16 @@ from collections import OrderedDict import nuke import six -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_current_project_name, get_representation_path, ) -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( containerise, update_container, viewer_update_and_undo_stop diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py b/client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py index cdfdfef3b8..4d8a8518f2 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py @@ -3,17 +3,17 @@ from collections import OrderedDict import six import nuke -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_current_project_name, get_representation_path, ) -from openpype.hosts.nuke.api import lib -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import lib +from ayon_core.hosts.nuke.api import ( containerise, update_container, viewer_update_and_undo_stop diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py b/client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py index 19b5cca74e..54daa74405 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py @@ -1,21 +1,21 @@ import nuke -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_current_project_name, get_representation_path, ) -from openpype.hosts.nuke.api.lib import ( +from ayon_core.hosts.nuke.api.lib import ( maintained_selection, get_avalon_knob_data, set_avalon_knob_data, swap_node_with_dependency, ) -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( containerise, update_container, viewer_update_and_undo_stop diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py b/client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py index 5b4877678a..677d9868f1 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py @@ -1,23 +1,23 @@ import nuke import six -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_current_project_name, get_representation_path, ) -from openpype.hosts.nuke.api.lib import ( +from ayon_core.hosts.nuke.api.lib import ( maintained_selection, create_backdrop, get_avalon_knob_data, set_avalon_knob_data, swap_node_with_dependency, ) -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( containerise, update_container, viewer_update_and_undo_stop diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_image.py b/client/ayon_core/hosts/nuke/plugins/load/load_image.py index 411a61d77b..b9f47bddc9 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_image.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_image.py @@ -2,24 +2,24 @@ import nuke import qargparse -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_current_project_name, get_representation_path, ) -from openpype.hosts.nuke.api.lib import ( +from ayon_core.hosts.nuke.api.lib import ( get_imageio_input_colorspace ) -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( containerise, update_container, viewer_update_and_undo_stop ) -from openpype.lib.transcoding import ( +from ayon_core.lib.transcoding import ( IMAGE_EXTENSIONS ) diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_matchmove.py b/client/ayon_core/hosts/nuke/plugins/load/load_matchmove.py index 14ddf20dc3..412181f3d9 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_matchmove.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_matchmove.py @@ -1,5 +1,5 @@ import nuke -from openpype.pipeline import load +from ayon_core.pipeline import load class MatchmoveLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_model.py b/client/ayon_core/hosts/nuke/plugins/load/load_model.py index 3fe92b74d0..125cb28e27 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_model.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_model.py @@ -1,16 +1,16 @@ import nuke -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_current_project_name, get_representation_path, ) -from openpype.hosts.nuke.api.lib import maintained_selection -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api.lib import maintained_selection +from ayon_core.hosts.nuke.api import ( containerise, update_container, viewer_update_and_undo_stop diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_ociolook.py b/client/ayon_core/hosts/nuke/plugins/load/load_ociolook.py index c0f8235253..e168c2bac1 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_ociolook.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_ociolook.py @@ -4,16 +4,16 @@ import secrets import nuke import six -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_current_project_name, get_representation_path, ) -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api import ( containerise, viewer_update_and_undo_stop, update_container, diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_script_precomp.py b/client/ayon_core/hosts/nuke/plugins/load/load_script_precomp.py index cbe19d217b..1c91e51a09 100644 --- a/client/ayon_core/hosts/nuke/plugins/load/load_script_precomp.py +++ b/client/ayon_core/hosts/nuke/plugins/load/load_script_precomp.py @@ -1,16 +1,16 @@ import nuke -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_last_version_by_subset_id, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_current_project_name, load, get_representation_path, ) -from openpype.hosts.nuke.api.lib import get_avalon_knob_data -from openpype.hosts.nuke.api import ( +from ayon_core.hosts.nuke.api.lib import get_avalon_knob_data +from ayon_core.hosts.nuke.api import ( containerise, update_container, viewer_update_and_undo_stop diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_backdrop.py b/client/ayon_core/hosts/nuke/plugins/publish/collect_backdrop.py index d04c1204e3..fc17de95b4 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/collect_backdrop.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/collect_backdrop.py @@ -1,6 +1,6 @@ from pprint import pformat import pyblish.api -from openpype.hosts.nuke.api import lib as pnlib +from ayon_core.hosts.nuke.api import lib as pnlib import nuke diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_context_data.py b/client/ayon_core/hosts/nuke/plugins/publish/collect_context_data.py index b85e924f55..0a032e5a2d 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/collect_context_data.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/collect_context_data.py @@ -1,9 +1,9 @@ import os import nuke import pyblish.api -from openpype.lib import get_version_from_path -import openpype.hosts.nuke.api as napi -from openpype.pipeline import KnownPublishError +from ayon_core.lib import get_version_from_path +import ayon_core.hosts.nuke.api as napi +from ayon_core.pipeline import KnownPublishError class CollectContextData(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py b/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py index 6f9245f5b9..84dc7992a5 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py @@ -1,8 +1,8 @@ import os import nuke import pyblish.api -from openpype.hosts.nuke import api as napi -from openpype.pipeline import publish +from ayon_core.hosts.nuke import api as napi +from ayon_core.pipeline import publish class CollectNukeWrites(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_backdrop.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_backdrop.py index 2a6a5dee2a..e53ce9015a 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/extract_backdrop.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_backdrop.py @@ -4,8 +4,8 @@ import nuke import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.nuke.api.lib import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.nuke.api.lib import ( maintained_selection, reset_selection, select_nodes diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_camera.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_camera.py index 3ec85c1f11..810a2e0a76 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/extract_camera.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_camera.py @@ -6,8 +6,8 @@ import nuke import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.nuke.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.nuke.api.lib import maintained_selection class ExtractCamera(publish.Extractor): diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_gizmo.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_gizmo.py index ecec0d6f80..2a2e2255fd 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/extract_gizmo.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_gizmo.py @@ -3,9 +3,9 @@ import nuke import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.nuke.api import utils as pnutils -from openpype.hosts.nuke.api.lib import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.nuke.api import utils as pnutils +from ayon_core.hosts.nuke.api.lib import ( maintained_selection, reset_selection, select_nodes diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_model.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_model.py index a8b37fb173..6f35e95630 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/extract_model.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_model.py @@ -3,8 +3,8 @@ from pprint import pformat import nuke import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.nuke.api.lib import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.nuke.api.lib import ( maintained_selection, select_nodes ) diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_ouput_node.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_ouput_node.py index 3fe1443bb3..b8e038a4f5 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/extract_ouput_node.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_ouput_node.py @@ -1,6 +1,6 @@ import nuke import pyblish.api -from openpype.hosts.nuke.api.lib import maintained_selection +from ayon_core.hosts.nuke.api.lib import maintained_selection class CreateOutputNode(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_render_local.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_render_local.py index ff04367e20..45514ede5e 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/extract_render_local.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_render_local.py @@ -4,9 +4,9 @@ import shutil import pyblish.api import clique import nuke -from openpype.hosts.nuke import api as napi -from openpype.pipeline import publish -from openpype.lib import collect_frames +from ayon_core.hosts.nuke import api as napi +from ayon_core.pipeline import publish +from ayon_core.lib import collect_frames class NukeRenderLocal(publish.Extractor, diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data.py index c221af40fb..258a019319 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data.py @@ -2,7 +2,7 @@ import os from pprint import pformat import pyblish.api -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractReviewData(publish.Extractor): diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data_lut.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data_lut.py index b007f90f6c..0674a2dd55 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data_lut.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data_lut.py @@ -1,9 +1,9 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.nuke.api import plugin -from openpype.hosts.nuke.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.nuke.api import plugin +from ayon_core.hosts.nuke.api.lib import maintained_selection class ExtractReviewDataLut(publish.Extractor): diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py index a02a807206..a00c1c593f 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py @@ -3,9 +3,9 @@ import re from pprint import pformat import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.nuke.api import plugin -from openpype.hosts.nuke.api.lib import maintained_selection +from ayon_core.pipeline import publish +from ayon_core.hosts.nuke.api import plugin +from ayon_core.hosts.nuke.api.lib import maintained_selection class ExtractReviewIntermediates(publish.Extractor): diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_slate_frame.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_slate_frame.py index 5816434f2b..0c4823b1aa 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/extract_slate_frame.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_slate_frame.py @@ -6,8 +6,8 @@ import copy import pyblish.api import six -from openpype.pipeline import publish -from openpype.hosts.nuke.api import ( +from ayon_core.pipeline import publish +from ayon_core.hosts.nuke.api import ( maintained_selection, duplicate_node, get_view_process_node diff --git a/client/ayon_core/hosts/nuke/plugins/publish/increment_script_version.py b/client/ayon_core/hosts/nuke/plugins/publish/increment_script_version.py index b854dc0aa1..6b0be42ba1 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/increment_script_version.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/increment_script_version.py @@ -17,7 +17,7 @@ class IncrementScriptVersion(pyblish.api.ContextPlugin): assert all(result["success"] for result in context.data["results"]), ( "Publishing not successful so version is not increased.") - from openpype.lib import version_up + from ayon_core.lib import version_up path = context.data["currentFile"] nuke.scriptSaveAs(version_up(path)) self.log.info('Incrementing script version') diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_asset_context.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_asset_context.py index 731645a11c..b4814c6a00 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/validate_asset_context.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_asset_context.py @@ -4,13 +4,13 @@ from __future__ import absolute_import import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishXmlValidationError, OptionalPyblishPluginMixin ) -from openpype.hosts.nuke.api import SelectInstanceNodeAction +from ayon_core.hosts.nuke.api import SelectInstanceNodeAction class ValidateCorrectAssetContext( diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_backdrop.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_backdrop.py index 761b080caa..22344c661e 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/validate_backdrop.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_backdrop.py @@ -1,8 +1,8 @@ import nuke import pyblish -from openpype.hosts.nuke import api as napi +from ayon_core.hosts.nuke import api as napi -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, OptionalPyblishPluginMixin diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_exposed_knobs.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_exposed_knobs.py index fe5644f0c9..9111bcdc2c 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/validate_exposed_knobs.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_exposed_knobs.py @@ -1,8 +1,8 @@ import pyblish.api -from openpype.pipeline.publish import get_errored_instances_from_context -from openpype.hosts.nuke.api.lib import link_knobs -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import get_errored_instances_from_context +from ayon_core.hosts.nuke.api.lib import link_knobs +from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError ) diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_gizmo.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_gizmo.py index 878d938bea..2cdcb90d70 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/validate_gizmo.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_gizmo.py @@ -1,6 +1,6 @@ import pyblish -from openpype.pipeline import PublishXmlValidationError -from openpype.hosts.nuke import api as napi +from ayon_core.pipeline import PublishXmlValidationError +from ayon_core.hosts.nuke import api as napi import nuke diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_knobs.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_knobs.py index db21cdc7c5..84efebab53 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/validate_knobs.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_knobs.py @@ -2,7 +2,7 @@ import nuke import six import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( RepairContextAction, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_output_resolution.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_output_resolution.py index ff6d73c6ec..e8a00d2294 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/validate_output_resolution.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_output_resolution.py @@ -1,8 +1,8 @@ import pyblish.api -from openpype.hosts.nuke import api as napi -from openpype.pipeline.publish import RepairAction -from openpype.pipeline import ( +from ayon_core.hosts.nuke import api as napi +from ayon_core.pipeline.publish import RepairAction +from ayon_core.pipeline import ( PublishXmlValidationError, OptionalPyblishPluginMixin ) diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_proxy_mode.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_proxy_mode.py index c26a03f31a..26e54295c9 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/validate_proxy_mode.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_proxy_mode.py @@ -1,6 +1,6 @@ import pyblish import nuke -from openpype.pipeline import PublishXmlValidationError +from ayon_core.pipeline import PublishXmlValidationError class FixProxyMode(pyblish.api.Action): diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_rendered_frames.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_rendered_frames.py index 64bf69b69b..852267f68c 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/validate_rendered_frames.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_rendered_frames.py @@ -1,8 +1,8 @@ import os import pyblish.api import clique -from openpype.pipeline import PublishXmlValidationError -from openpype.pipeline.publish import get_errored_instances_from_context +from ayon_core.pipeline import PublishXmlValidationError +from ayon_core.pipeline.publish import get_errored_instances_from_context class RepairActionBase(pyblish.api.Action): diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_script_attributes.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_script_attributes.py index 57bfce7993..c4974817bd 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/validate_script_attributes.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_script_attributes.py @@ -1,11 +1,11 @@ from copy import deepcopy import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishXmlValidationError, OptionalPyblishPluginMixin ) -from openpype.pipeline.publish import RepairAction -from openpype.hosts.nuke.api.lib import ( +from ayon_core.pipeline.publish import RepairAction +from ayon_core.hosts.nuke.api.lib import ( WorkfileSettings ) diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_write_nodes.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_write_nodes.py index f490b580d6..4274d68826 100644 --- a/client/ayon_core/hosts/nuke/plugins/publish/validate_write_nodes.py +++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_write_nodes.py @@ -1,14 +1,14 @@ from collections import defaultdict import pyblish.api -from openpype.pipeline.publish import get_errored_instances_from_context -from openpype.hosts.nuke.api.lib import ( +from ayon_core.pipeline.publish import get_errored_instances_from_context +from ayon_core.hosts.nuke.api.lib import ( get_write_node_template_attr, set_node_knobs_from_settings, color_gui_to_int ) -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( PublishXmlValidationError, OptionalPyblishPluginMixin ) diff --git a/client/ayon_core/hosts/nuke/startup/clear_rendered.py b/client/ayon_core/hosts/nuke/startup/clear_rendered.py index 744af71034..8072aae14f 100644 --- a/client/ayon_core/hosts/nuke/startup/clear_rendered.py +++ b/client/ayon_core/hosts/nuke/startup/clear_rendered.py @@ -1,6 +1,6 @@ import os -from openpype.lib import Logger +from ayon_core.lib import Logger def clear_rendered(dir_path): diff --git a/client/ayon_core/hosts/nuke/startup/custom_write_node.py b/client/ayon_core/hosts/nuke/startup/custom_write_node.py index ea53725834..01e255d0c0 100644 --- a/client/ayon_core/hosts/nuke/startup/custom_write_node.py +++ b/client/ayon_core/hosts/nuke/startup/custom_write_node.py @@ -2,8 +2,8 @@ import os import nuke import nukescripts -from openpype.pipeline import Anatomy -from openpype.hosts.nuke.api.lib import ( +from ayon_core.pipeline import Anatomy +from ayon_core.hosts.nuke.api.lib import ( set_node_knobs_from_settings, get_nuke_imageio_settings ) diff --git a/client/ayon_core/hosts/nuke/startup/menu.py b/client/ayon_core/hosts/nuke/startup/menu.py index 613d508387..2559e2142a 100644 --- a/client/ayon_core/hosts/nuke/startup/menu.py +++ b/client/ayon_core/hosts/nuke/startup/menu.py @@ -1,5 +1,5 @@ -from openpype.pipeline import install_host -from openpype.hosts.nuke.api import NukeHost +from ayon_core.pipeline import install_host +from ayon_core.hosts.nuke.api import NukeHost host = NukeHost() install_host(host) diff --git a/client/ayon_core/hosts/nuke/startup/write_to_read.py b/client/ayon_core/hosts/nuke/startup/write_to_read.py index b7add40f47..8a8ffb8d3d 100644 --- a/client/ayon_core/hosts/nuke/startup/write_to_read.py +++ b/client/ayon_core/hosts/nuke/startup/write_to_read.py @@ -2,7 +2,7 @@ import re import os import glob import nuke -from openpype.lib import Logger +from ayon_core.lib import Logger log = Logger.get_logger(__name__) SINGLE_FILE_FORMATS = ['avi', 'mp4', 'mxf', 'mov', 'mpg', 'mpeg', 'wmv', 'm4v', diff --git a/client/ayon_core/hosts/photoshop/addon.py b/client/ayon_core/hosts/photoshop/addon.py index 965a545ac5..aa61c08b32 100644 --- a/client/ayon_core/hosts/photoshop/addon.py +++ b/client/ayon_core/hosts/photoshop/addon.py @@ -1,5 +1,5 @@ import os -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon PHOTOSHOP_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/photoshop/api/README.md b/client/ayon_core/hosts/photoshop/api/README.md index a207d21f2f..bc3b883daf 100644 --- a/client/ayon_core/hosts/photoshop/api/README.md +++ b/client/ayon_core/hosts/photoshop/api/README.md @@ -17,7 +17,7 @@ ExManCmd /install {path to addon}/api/extension.zxp The easiest way to get the server and Photoshop launch is with: ``` -python -c ^"import openpype.hosts.photoshop;openpype.hosts.photoshop.launch(""C:\Program Files\Adobe\Adobe Photoshop 2020\Photoshop.exe"")^" +python -c ^"import ayon_core.hosts.photoshop;openpype.hosts.photoshop.launch(""C:\Program Files\Adobe\Adobe Photoshop 2020\Photoshop.exe"")^" ``` `avalon.photoshop.launch` launches the application and server, and also closes the server when Photoshop exists. @@ -127,8 +127,8 @@ class CollectInstances(pyblish.api.ContextPlugin): ```python import os -from openpype.pipeline import publish -from openpype.hosts.photoshop import api as photoshop +from ayon_core.pipeline import publish +from ayon_core.hosts.photoshop import api as photoshop class ExtractImage(publish.Extractor): @@ -195,7 +195,7 @@ class ExtractImage(publish.Extractor): #### Loader Plugin ```python from avalon import api, photoshop -from openpype.pipeline import load, get_representation_path +from ayon_core.pipeline import load, get_representation_path stub = photoshop.stub() diff --git a/client/ayon_core/hosts/photoshop/api/launch_logic.py b/client/ayon_core/hosts/photoshop/api/launch_logic.py index 25732446b5..adf90be311 100644 --- a/client/ayon_core/hosts/photoshop/api/launch_logic.py +++ b/client/ayon_core/hosts/photoshop/api/launch_logic.py @@ -10,20 +10,20 @@ from wsrpc_aiohttp import ( from qtpy import QtCore -from openpype.lib import Logger, StringTemplate -from openpype.pipeline import ( +from ayon_core.lib import Logger, StringTemplate +from ayon_core.pipeline import ( registered_host, Anatomy, ) -from openpype.pipeline.workfile import ( +from ayon_core.pipeline.workfile import ( get_workfile_template_key_from_context, get_last_workfile, ) -from openpype.pipeline.template_data import get_template_data_with_names -from openpype.tools.utils import host_tools -from openpype.tools.adobe_webserver.app import WebServerTool -from openpype.pipeline.context_tools import change_current_context -from openpype.client import get_asset_by_name +from ayon_core.pipeline.template_data import get_template_data_with_names +from ayon_core.tools.utils import host_tools +from ayon_core.tools.adobe_webserver.app import WebServerTool +from ayon_core.pipeline.context_tools import change_current_context +from ayon_core.client import get_asset_by_name from .ws_stub import PhotoshopServerStub diff --git a/client/ayon_core/hosts/photoshop/api/lib.py b/client/ayon_core/hosts/photoshop/api/lib.py index d4d4995e6d..1343837c01 100644 --- a/client/ayon_core/hosts/photoshop/api/lib.py +++ b/client/ayon_core/hosts/photoshop/api/lib.py @@ -3,12 +3,12 @@ import sys import contextlib import traceback -from openpype.lib import env_value_to_bool, Logger -from openpype.modules import ModulesManager -from openpype.pipeline import install_host -from openpype.tools.utils import host_tools -from openpype.tools.utils import get_openpype_qt_app -from openpype.tests.lib import is_in_tests +from ayon_core.lib import env_value_to_bool, Logger +from ayon_core.modules import ModulesManager +from ayon_core.pipeline import install_host +from ayon_core.tools.utils import host_tools +from ayon_core.tools.utils import get_openpype_qt_app +from ayon_core.tests.lib import is_in_tests from .launch_logic import ProcessLauncher, stub @@ -20,7 +20,7 @@ def safe_excepthook(*args): def main(*subprocess_args): - from openpype.hosts.photoshop.api import PhotoshopHost + from ayon_core.hosts.photoshop.api import PhotoshopHost host = PhotoshopHost() install_host(host) diff --git a/client/ayon_core/hosts/photoshop/api/pipeline.py b/client/ayon_core/hosts/photoshop/api/pipeline.py index 4e0dbcad06..1a69ee4ec3 100644 --- a/client/ayon_core/hosts/photoshop/api/pipeline.py +++ b/client/ayon_core/hosts/photoshop/api/pipeline.py @@ -4,23 +4,23 @@ from qtpy import QtWidgets import pyblish.api -from openpype.lib import register_event_callback, Logger -from openpype.pipeline import ( +from ayon_core.lib import register_event_callback, Logger +from ayon_core.pipeline import ( register_loader_plugin_path, register_creator_plugin_path, AVALON_CONTAINER_ID, ) -from openpype.host import ( +from ayon_core.host import ( HostBase, IWorkfileHost, ILoadHost, IPublishHost ) -from openpype.pipeline.load import any_outdated_containers -from openpype.hosts.photoshop import PHOTOSHOP_HOST_DIR -from openpype.tools.utils import get_openpype_qt_app +from ayon_core.pipeline.load import any_outdated_containers +from ayon_core.hosts.photoshop import PHOTOSHOP_HOST_DIR +from ayon_core.tools.utils import get_openpype_qt_app from . import lib diff --git a/client/ayon_core/hosts/photoshop/api/plugin.py b/client/ayon_core/hosts/photoshop/api/plugin.py index c80e6bbd06..22645a1f9b 100644 --- a/client/ayon_core/hosts/photoshop/api/plugin.py +++ b/client/ayon_core/hosts/photoshop/api/plugin.py @@ -1,6 +1,6 @@ import re -from openpype.pipeline import LoaderPlugin +from ayon_core.pipeline import LoaderPlugin from .launch_logic import stub diff --git a/client/ayon_core/hosts/photoshop/api/ws_stub.py b/client/ayon_core/hosts/photoshop/api/ws_stub.py index 2c4d0ad5fc..42bad05f26 100644 --- a/client/ayon_core/hosts/photoshop/api/ws_stub.py +++ b/client/ayon_core/hosts/photoshop/api/ws_stub.py @@ -6,7 +6,7 @@ import json import attr from wsrpc_aiohttp import WebSocketAsync -from openpype.tools.adobe_webserver.app import WebServerTool +from ayon_core.tools.adobe_webserver.app import WebServerTool @attr.s diff --git a/client/ayon_core/hosts/photoshop/lib.py b/client/ayon_core/hosts/photoshop/lib.py index 5c8dff947d..2b777c65a4 100644 --- a/client/ayon_core/hosts/photoshop/lib.py +++ b/client/ayon_core/hosts/photoshop/lib.py @@ -1,14 +1,14 @@ import re -from openpype import AYON_SERVER_ENABLED -import openpype.hosts.photoshop.api as api -from openpype.client import get_asset_by_name -from openpype.lib import prepare_template_data -from openpype.pipeline import ( +from ayon_core import AYON_SERVER_ENABLED +import ayon_core.hosts.photoshop.api as api +from ayon_core.client import get_asset_by_name +from ayon_core.lib import prepare_template_data +from ayon_core.pipeline import ( AutoCreator, CreatedInstance ) -from openpype.hosts.photoshop.api.pipeline import cache_and_get_instances +from ayon_core.hosts.photoshop.api.pipeline import cache_and_get_instances class PSAutoCreator(AutoCreator): diff --git a/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py b/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py index 24be9df0e0..7dca901c21 100644 --- a/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py +++ b/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py @@ -1,12 +1,12 @@ -from openpype.pipeline import CreatedInstance +from ayon_core.pipeline import CreatedInstance -from openpype import AYON_SERVER_ENABLED -from openpype.lib import BoolDef -import openpype.hosts.photoshop.api as api -from openpype.hosts.photoshop.lib import PSAutoCreator, clean_subset_name -from openpype.pipeline.create import get_subset_name -from openpype.lib import prepare_template_data -from openpype.client import get_asset_by_name +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.lib import BoolDef +import ayon_core.hosts.photoshop.api as api +from ayon_core.hosts.photoshop.lib import PSAutoCreator, clean_subset_name +from ayon_core.pipeline.create import get_subset_name +from ayon_core.lib import prepare_template_data +from ayon_core.client import get_asset_by_name class AutoImageCreator(PSAutoCreator): diff --git a/client/ayon_core/hosts/photoshop/plugins/create/create_image.py b/client/ayon_core/hosts/photoshop/plugins/create/create_image.py index 4f2e90886a..a28872bba1 100644 --- a/client/ayon_core/hosts/photoshop/plugins/create/create_image.py +++ b/client/ayon_core/hosts/photoshop/plugins/create/create_image.py @@ -1,16 +1,16 @@ import re -from openpype.hosts.photoshop import api -from openpype.lib import BoolDef -from openpype.pipeline import ( +from ayon_core.hosts.photoshop import api +from ayon_core.lib import BoolDef +from ayon_core.pipeline import ( Creator, CreatedInstance, CreatorError ) -from openpype.lib import prepare_template_data -from openpype.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS -from openpype.hosts.photoshop.api.pipeline import cache_and_get_instances -from openpype.hosts.photoshop.lib import clean_subset_name +from ayon_core.lib import prepare_template_data +from ayon_core.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS +from ayon_core.hosts.photoshop.api.pipeline import cache_and_get_instances +from ayon_core.hosts.photoshop.lib import clean_subset_name class ImageCreator(Creator): diff --git a/client/ayon_core/hosts/photoshop/plugins/create/create_review.py b/client/ayon_core/hosts/photoshop/plugins/create/create_review.py index 63751d94e4..888b294248 100644 --- a/client/ayon_core/hosts/photoshop/plugins/create/create_review.py +++ b/client/ayon_core/hosts/photoshop/plugins/create/create_review.py @@ -1,4 +1,4 @@ -from openpype.hosts.photoshop.lib import PSAutoCreator +from ayon_core.hosts.photoshop.lib import PSAutoCreator class ReviewCreator(PSAutoCreator): diff --git a/client/ayon_core/hosts/photoshop/plugins/create/create_workfile.py b/client/ayon_core/hosts/photoshop/plugins/create/create_workfile.py index 1b255de3a3..3485027215 100644 --- a/client/ayon_core/hosts/photoshop/plugins/create/create_workfile.py +++ b/client/ayon_core/hosts/photoshop/plugins/create/create_workfile.py @@ -1,4 +1,4 @@ -from openpype.hosts.photoshop.lib import PSAutoCreator +from ayon_core.hosts.photoshop.lib import PSAutoCreator class WorkfileCreator(PSAutoCreator): diff --git a/client/ayon_core/hosts/photoshop/plugins/load/load_image.py b/client/ayon_core/hosts/photoshop/plugins/load/load_image.py index eb770bbd20..0fa6bca901 100644 --- a/client/ayon_core/hosts/photoshop/plugins/load/load_image.py +++ b/client/ayon_core/hosts/photoshop/plugins/load/load_image.py @@ -1,8 +1,8 @@ import re -from openpype.pipeline import get_representation_path -from openpype.hosts.photoshop import api as photoshop -from openpype.hosts.photoshop.api import get_unique_layer_name +from ayon_core.pipeline import get_representation_path +from ayon_core.hosts.photoshop import api as photoshop +from ayon_core.hosts.photoshop.api import get_unique_layer_name class ImageLoader(photoshop.PhotoshopLoader): diff --git a/client/ayon_core/hosts/photoshop/plugins/load/load_image_from_sequence.py b/client/ayon_core/hosts/photoshop/plugins/load/load_image_from_sequence.py index f9fceb80bb..06ac70041e 100644 --- a/client/ayon_core/hosts/photoshop/plugins/load/load_image_from_sequence.py +++ b/client/ayon_core/hosts/photoshop/plugins/load/load_image_from_sequence.py @@ -2,8 +2,8 @@ import os import qargparse -from openpype.hosts.photoshop import api as photoshop -from openpype.hosts.photoshop.api import get_unique_layer_name +from ayon_core.hosts.photoshop import api as photoshop +from ayon_core.hosts.photoshop.api import get_unique_layer_name class ImageFromSequenceLoader(photoshop.PhotoshopLoader): diff --git a/client/ayon_core/hosts/photoshop/plugins/load/load_reference.py b/client/ayon_core/hosts/photoshop/plugins/load/load_reference.py index 5772e243d5..e2fec039d0 100644 --- a/client/ayon_core/hosts/photoshop/plugins/load/load_reference.py +++ b/client/ayon_core/hosts/photoshop/plugins/load/load_reference.py @@ -1,8 +1,8 @@ import re -from openpype.pipeline import get_representation_path -from openpype.hosts.photoshop import api as photoshop -from openpype.hosts.photoshop.api import get_unique_layer_name +from ayon_core.pipeline import get_representation_path +from ayon_core.hosts.photoshop import api as photoshop +from ayon_core.hosts.photoshop.api import get_unique_layer_name class ReferenceLoader(photoshop.PhotoshopLoader): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/closePS.py b/client/ayon_core/hosts/photoshop/plugins/publish/closePS.py index b4c3a4c966..6f86d98580 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/closePS.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/closePS.py @@ -4,7 +4,7 @@ import os import pyblish.api -from openpype.hosts.photoshop import api as photoshop +from ayon_core.hosts.photoshop import api as photoshop class ClosePS(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py index 4d7838c510..051a3da0a1 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py @@ -1,8 +1,8 @@ import pyblish.api -from openpype.client import get_asset_name_identifier -from openpype.hosts.photoshop import api as photoshop -from openpype.pipeline.create import get_subset_name +from ayon_core.client import get_asset_name_identifier +from ayon_core.hosts.photoshop import api as photoshop +from ayon_core.pipeline.create import get_subset_name class CollectAutoImage(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py index 741fb0e9cd..0585f4f226 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.hosts.photoshop import api as photoshop +from ayon_core.hosts.photoshop import api as photoshop class CollectAutoImageRefresh(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_review.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_review.py index e5a2f326d7..c8d4ddf111 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_review.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_review.py @@ -7,9 +7,9 @@ Provides: """ import pyblish.api -from openpype.client import get_asset_name_identifier -from openpype.hosts.photoshop import api as photoshop -from openpype.pipeline.create import get_subset_name +from ayon_core.client import get_asset_name_identifier +from ayon_core.hosts.photoshop import api as photoshop +from ayon_core.pipeline.create import get_subset_name class CollectAutoReview(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_workfile.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_workfile.py index 9ccb8f4f85..365fd0a684 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_workfile.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_workfile.py @@ -1,9 +1,9 @@ import os import pyblish.api -from openpype.client import get_asset_name_identifier -from openpype.hosts.photoshop import api as photoshop -from openpype.pipeline.create import get_subset_name +from ayon_core.client import get_asset_name_identifier +from ayon_core.hosts.photoshop import api as photoshop +from ayon_core.pipeline.create import get_subset_name class CollectAutoWorkfile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py index b13ff5e476..1d51d90866 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py @@ -17,12 +17,12 @@ import os import pyblish.api -from openpype.pipeline import legacy_io +from ayon_core.pipeline import legacy_io from openpype_modules.webpublisher.lib import ( get_batch_asset_task_info, parse_json ) -from openpype.tests.lib import is_in_tests +from ayon_core.tests.lib import is_in_tests class CollectBatchData(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py index c16616bcb2..2d90b09bb1 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py @@ -3,10 +3,10 @@ import re import pyblish.api -from openpype.lib import prepare_template_data -from openpype.hosts.photoshop import api as photoshop -from openpype.settings import get_project_settings -from openpype.tests.lib import is_in_tests +from ayon_core.lib import prepare_template_data +from ayon_core.hosts.photoshop import api as photoshop +from ayon_core.settings import get_project_settings +from ayon_core.tests.lib import is_in_tests class CollectColorCodedInstances(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_current_file.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_current_file.py index 5daf47c6ac..74353d452f 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_current_file.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_current_file.py @@ -2,7 +2,7 @@ import os import pyblish.api -from openpype.hosts.photoshop import api as photoshop +from ayon_core.hosts.photoshop import api as photoshop class CollectCurrentFile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_extension_version.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_extension_version.py index dc0678c9af..2d24a8de15 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_extension_version.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_extension_version.py @@ -2,7 +2,7 @@ import os import re import pyblish.api -from openpype.hosts.photoshop import api as photoshop +from ayon_core.hosts.photoshop import api as photoshop class CollectExtensionVersion(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_image.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_image.py index 64727cef33..bfd73bfc5f 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_image.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_image.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.hosts.photoshop import api +from ayon_core.hosts.photoshop import api class CollectImage(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_published_version.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_published_version.py index eec6f1fae4..e330b04a1f 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_published_version.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_published_version.py @@ -17,8 +17,8 @@ Provides: import pyblish.api -from openpype.client import get_last_version_by_subset_name -from openpype.pipeline.version_start import get_versioning_start +from ayon_core.client import get_last_version_by_subset_name +from ayon_core.pipeline.version_start import get_versioning_start class CollectPublishedVersion(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py index 87ec4ee3f1..e487760736 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py @@ -10,7 +10,7 @@ import os import pyblish.api -from openpype.pipeline.create import get_subset_name +from ayon_core.pipeline.create import get_subset_name class CollectReview(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_workfile.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_workfile.py index 9625464499..6740a6c82a 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_workfile.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_workfile.py @@ -1,7 +1,7 @@ import os import pyblish.api -from openpype.pipeline.create import get_subset_name +from ayon_core.pipeline.create import get_subset_name class CollectWorkfile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/extract_image.py b/client/ayon_core/hosts/photoshop/plugins/publish/extract_image.py index 680f580cc0..71605b53d9 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/extract_image.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/extract_image.py @@ -1,8 +1,8 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.photoshop import api as photoshop +from ayon_core.pipeline import publish +from ayon_core.hosts.photoshop import api as photoshop class ExtractImage(pyblish.api.ContextPlugin): @@ -96,6 +96,6 @@ class ExtractImage(pyblish.api.ContextPlugin): the instance.data['stagingDir'] """ - from openpype.pipeline.publish import get_instance_staging_dir + from ayon_core.pipeline.publish import get_instance_staging_dir return get_instance_staging_dir(instance) diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/extract_review.py b/client/ayon_core/hosts/photoshop/plugins/publish/extract_review.py index 09c5d63aa5..732a53f194 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/extract_review.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/extract_review.py @@ -2,12 +2,12 @@ import os import shutil from PIL import Image -from openpype.lib import ( +from ayon_core.lib import ( run_subprocess, get_ffmpeg_tool_args, ) -from openpype.pipeline import publish -from openpype.hosts.photoshop import api as photoshop +from ayon_core.pipeline import publish +from ayon_core.hosts.photoshop import api as photoshop class ExtractReview(publish.Extractor): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/extract_save_scene.py b/client/ayon_core/hosts/photoshop/plugins/publish/extract_save_scene.py index aa900fec9f..962c0722db 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/extract_save_scene.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/extract_save_scene.py @@ -1,5 +1,5 @@ -from openpype.pipeline import publish -from openpype.hosts.photoshop import api as photoshop +from ayon_core.pipeline import publish +from ayon_core.hosts.photoshop import api as photoshop class ExtractSaveScene(publish.Extractor): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/increment_workfile.py b/client/ayon_core/hosts/photoshop/plugins/publish/increment_workfile.py index 665dd67fc5..9b25a35ef5 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/increment_workfile.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/increment_workfile.py @@ -1,9 +1,9 @@ import os import pyblish.api -from openpype.pipeline.publish import get_errored_plugins_from_context -from openpype.lib import version_up +from ayon_core.pipeline.publish import get_errored_plugins_from_context +from ayon_core.lib import version_up -from openpype.hosts.photoshop import api as photoshop +from ayon_core.hosts.photoshop import api as photoshop class IncrementWorkfile(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/validate_instance_asset.py b/client/ayon_core/hosts/photoshop/plugins/publish/validate_instance_asset.py index 1a4932fe99..dc0f2efd52 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/validate_instance_asset.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/validate_instance_asset.py @@ -1,12 +1,12 @@ import pyblish.api -from openpype.pipeline import get_current_asset_name -from openpype.pipeline.publish import ( +from ayon_core.pipeline import get_current_asset_name +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, OptionalPyblishPluginMixin ) -from openpype.hosts.photoshop import api as photoshop +from ayon_core.hosts.photoshop import api as photoshop class ValidateInstanceAssetRepair(pyblish.api.Action): diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/validate_naming.py b/client/ayon_core/hosts/photoshop/plugins/publish/validate_naming.py index 07810f505e..89018a1cff 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/validate_naming.py +++ b/client/ayon_core/hosts/photoshop/plugins/publish/validate_naming.py @@ -2,9 +2,9 @@ import re import pyblish.api -from openpype.hosts.photoshop import api as photoshop -from openpype.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS -from openpype.pipeline.publish import ( +from ayon_core.hosts.photoshop import api as photoshop +from ayon_core.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/resolve/addon.py b/client/ayon_core/hosts/resolve/addon.py index 02c1d7957f..9c9932826b 100644 --- a/client/ayon_core/hosts/resolve/addon.py +++ b/client/ayon_core/hosts/resolve/addon.py @@ -1,6 +1,6 @@ import os -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon from .utils import RESOLVE_ROOT_DIR diff --git a/client/ayon_core/hosts/resolve/api/action.py b/client/ayon_core/hosts/resolve/api/action.py index d1dffca7cc..620d51b2b3 100644 --- a/client/ayon_core/hosts/resolve/api/action.py +++ b/client/ayon_core/hosts/resolve/api/action.py @@ -4,7 +4,7 @@ from __future__ import absolute_import import pyblish.api -from openpype.pipeline.publish import get_errored_instances_from_context +from ayon_core.pipeline.publish import get_errored_instances_from_context class SelectInvalidAction(pyblish.api.Action): diff --git a/client/ayon_core/hosts/resolve/api/lib.py b/client/ayon_core/hosts/resolve/api/lib.py index 3866477c77..2c648bb4cc 100644 --- a/client/ayon_core/hosts/resolve/api/lib.py +++ b/client/ayon_core/hosts/resolve/api/lib.py @@ -5,8 +5,8 @@ import os import contextlib from opentimelineio import opentime -from openpype.lib import Logger -from openpype.pipeline.editorial import ( +from ayon_core.lib import Logger +from ayon_core.pipeline.editorial import ( is_overlapping_otio_ranges, frames_to_timecode ) diff --git a/client/ayon_core/hosts/resolve/api/menu.py b/client/ayon_core/hosts/resolve/api/menu.py index 2210178a67..ec8d287ea6 100644 --- a/client/ayon_core/hosts/resolve/api/menu.py +++ b/client/ayon_core/hosts/resolve/api/menu.py @@ -3,8 +3,8 @@ import sys from qtpy import QtWidgets, QtCore, QtGui -from openpype.tools.utils import host_tools -from openpype.pipeline import registered_host +from ayon_core.tools.utils import host_tools +from ayon_core.pipeline import registered_host MENU_LABEL = os.environ["AVALON_LABEL"] diff --git a/client/ayon_core/hosts/resolve/api/pipeline.py b/client/ayon_core/hosts/resolve/api/pipeline.py index 93dec300fb..107e0f795f 100644 --- a/client/ayon_core/hosts/resolve/api/pipeline.py +++ b/client/ayon_core/hosts/resolve/api/pipeline.py @@ -7,14 +7,14 @@ from collections import OrderedDict from pyblish import api as pyblish -from openpype.lib import Logger -from openpype.pipeline import ( +from ayon_core.lib import Logger +from ayon_core.pipeline import ( schema, register_loader_plugin_path, register_creator_plugin_path, AVALON_CONTAINER_ID, ) -from openpype.host import ( +from ayon_core.host import ( HostBase, IWorkfileHost, ILoadHost @@ -246,7 +246,7 @@ def on_pyblish_instance_toggled(instance, old_value, new_value): log.info("instance toggle: {}, old_value: {}, new_value:{} ".format( instance, old_value, new_value)) - from openpype.hosts.resolve.api import ( + from ayon_core.hosts.resolve.api import ( set_publish_attribute ) diff --git a/client/ayon_core/hosts/resolve/api/plugin.py b/client/ayon_core/hosts/resolve/api/plugin.py index a00933405f..7ec8d55037 100644 --- a/client/ayon_core/hosts/resolve/api/plugin.py +++ b/client/ayon_core/hosts/resolve/api/plugin.py @@ -5,8 +5,8 @@ import copy import qargparse from qtpy import QtWidgets, QtCore -from openpype.settings import get_current_project_settings -from openpype.pipeline import ( +from ayon_core.settings import get_current_project_settings +from ayon_core.pipeline import ( LegacyCreator, LoaderPlugin, Anatomy diff --git a/client/ayon_core/hosts/resolve/api/utils.py b/client/ayon_core/hosts/resolve/api/utils.py index 851851a3b3..c22113d4a1 100644 --- a/client/ayon_core/hosts/resolve/api/utils.py +++ b/client/ayon_core/hosts/resolve/api/utils.py @@ -7,13 +7,13 @@ Resolve's tools for setting environment import os import sys -from openpype.lib import Logger +from ayon_core.lib import Logger log = Logger.get_logger(__name__) def get_resolve_module(): - from openpype.hosts.resolve import api + from ayon_core.hosts.resolve import api # dont run if already loaded if api.bmdvr: log.info(("resolve module is assigned to " diff --git a/client/ayon_core/hosts/resolve/api/workio.py b/client/ayon_core/hosts/resolve/api/workio.py index 9101d6fce6..5e4865ddc5 100644 --- a/client/ayon_core/hosts/resolve/api/workio.py +++ b/client/ayon_core/hosts/resolve/api/workio.py @@ -1,7 +1,7 @@ """Host API required Work Files tool""" import os -from openpype.lib import Logger +from ayon_core.lib import Logger from .lib import ( get_project_manager, get_current_project diff --git a/client/ayon_core/hosts/resolve/hooks/pre_resolve_last_workfile.py b/client/ayon_core/hosts/resolve/hooks/pre_resolve_last_workfile.py index 73f5ac75b1..c0b38ab757 100644 --- a/client/ayon_core/hosts/resolve/hooks/pre_resolve_last_workfile.py +++ b/client/ayon_core/hosts/resolve/hooks/pre_resolve_last_workfile.py @@ -1,5 +1,5 @@ import os -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class PreLaunchResolveLastWorkfile(PreLaunchHook): diff --git a/client/ayon_core/hosts/resolve/hooks/pre_resolve_setup.py b/client/ayon_core/hosts/resolve/hooks/pre_resolve_setup.py index 326f37dffc..be8ccaa5c5 100644 --- a/client/ayon_core/hosts/resolve/hooks/pre_resolve_setup.py +++ b/client/ayon_core/hosts/resolve/hooks/pre_resolve_setup.py @@ -1,8 +1,8 @@ import os from pathlib import Path import platform -from openpype.lib.applications import PreLaunchHook, LaunchTypes -from openpype.hosts.resolve.utils import setup +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.hosts.resolve.utils import setup class PreLaunchResolveSetup(PreLaunchHook): diff --git a/client/ayon_core/hosts/resolve/hooks/pre_resolve_startup.py b/client/ayon_core/hosts/resolve/hooks/pre_resolve_startup.py index 6dbfd09a37..185066f3f1 100644 --- a/client/ayon_core/hosts/resolve/hooks/pre_resolve_startup.py +++ b/client/ayon_core/hosts/resolve/hooks/pre_resolve_startup.py @@ -1,7 +1,7 @@ import os -from openpype.lib.applications import PreLaunchHook, LaunchTypes -import openpype.hosts.resolve +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes +import ayon_core.hosts.resolve class PreLaunchResolveStartup(PreLaunchHook): diff --git a/client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py b/client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py index 4b14f2493f..65bc9fed9d 100644 --- a/client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py +++ b/client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py @@ -1,6 +1,6 @@ # from pprint import pformat -from openpype.hosts.resolve.api import plugin, lib -from openpype.hosts.resolve.api.lib import ( +from ayon_core.hosts.resolve.api import plugin, lib +from ayon_core.hosts.resolve.api.lib import ( get_video_track_names, create_bin, ) diff --git a/client/ayon_core/hosts/resolve/plugins/load/load_clip.py b/client/ayon_core/hosts/resolve/plugins/load/load_clip.py index d3f83c7f24..47aeac213b 100644 --- a/client/ayon_core/hosts/resolve/plugins/load/load_clip.py +++ b/client/ayon_core/hosts/resolve/plugins/load/load_clip.py @@ -1,14 +1,14 @@ -from openpype.client import get_last_version_by_subset_id -from openpype.pipeline import ( +from ayon_core.client import get_last_version_by_subset_id +from ayon_core.pipeline import ( get_representation_context, get_current_project_name ) -from openpype.hosts.resolve.api import lib, plugin -from openpype.hosts.resolve.api.pipeline import ( +from ayon_core.hosts.resolve.api import lib, plugin +from ayon_core.hosts.resolve.api.pipeline import ( containerise, update_container, ) -from openpype.lib.transcoding import ( +from ayon_core.lib.transcoding import ( VIDEO_EXTENSIONS, IMAGE_EXTENSIONS ) diff --git a/client/ayon_core/hosts/resolve/plugins/publish/extract_workfile.py b/client/ayon_core/hosts/resolve/plugins/publish/extract_workfile.py index db63487405..48ebdee7e3 100644 --- a/client/ayon_core/hosts/resolve/plugins/publish/extract_workfile.py +++ b/client/ayon_core/hosts/resolve/plugins/publish/extract_workfile.py @@ -1,8 +1,8 @@ import os import pyblish.api -from openpype.pipeline import publish -from openpype.hosts.resolve.api.lib import get_project_manager +from ayon_core.pipeline import publish +from ayon_core.hosts.resolve.api.lib import get_project_manager class ExtractWorkfile(publish.Extractor): diff --git a/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py b/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py index bca6734848..a55ee3e304 100644 --- a/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py +++ b/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py @@ -2,14 +2,14 @@ from pprint import pformat import pyblish -from openpype.hosts.resolve.api.lib import ( +from ayon_core.hosts.resolve.api.lib import ( get_current_timeline_items, get_timeline_item_pype_tag, publish_clip_color, get_publish_attribute, get_otio_clip_instance_data, ) -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED class PrecollectInstances(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py b/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py index ccc5fd86ff..dae9bf6059 100644 --- a/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py +++ b/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py @@ -1,11 +1,11 @@ import pyblish.api from pprint import pformat -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import get_current_asset_name +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import get_current_asset_name -from openpype.hosts.resolve import api as rapi -from openpype.hosts.resolve.otio import davinci_export +from ayon_core.hosts.resolve import api as rapi +from ayon_core.hosts.resolve.otio import davinci_export class PrecollectWorkfile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/resolve/startup.py b/client/ayon_core/hosts/resolve/startup.py index 5ac3c99524..1a583767d5 100644 --- a/client/ayon_core/hosts/resolve/startup.py +++ b/client/ayon_core/hosts/resolve/startup.py @@ -10,8 +10,8 @@ This code runs in a separate process to the main Resolve process. """ import os -from openpype.lib import Logger -import openpype.hosts.resolve.api +from ayon_core.lib import Logger +import ayon_core.hosts.resolve.api log = Logger.get_logger(__name__) @@ -22,7 +22,7 @@ def ensure_installed_host(): This function can be called multiple times without triggering an additional install. """ - from openpype.pipeline import install_host, registered_host + from ayon_core.pipeline import install_host, registered_host host = registered_host() if host: return host @@ -55,8 +55,8 @@ def main(): log.info("No last workfile set to open. Skipping..") # Launch OpenPype menu - from openpype.settings import get_project_settings - from openpype.pipeline.context_tools import get_current_project_name + from ayon_core.settings import get_project_settings + from ayon_core.pipeline.context_tools import get_current_project_name project_name = get_current_project_name() log.info(f"Current project name in context: {project_name}") diff --git a/client/ayon_core/hosts/resolve/utility_scripts/AYON__Menu.py b/client/ayon_core/hosts/resolve/utility_scripts/AYON__Menu.py index 4f14927074..08cefb9d61 100644 --- a/client/ayon_core/hosts/resolve/utility_scripts/AYON__Menu.py +++ b/client/ayon_core/hosts/resolve/utility_scripts/AYON__Menu.py @@ -1,14 +1,14 @@ import os import sys -from openpype.pipeline import install_host -from openpype.lib import Logger +from ayon_core.pipeline import install_host +from ayon_core.lib import Logger log = Logger.get_logger(__name__) def main(env): - from openpype.hosts.resolve.api import ResolveHost, launch_pype_menu + from ayon_core.hosts.resolve.api import ResolveHost, launch_pype_menu # activate resolve from openpype host = ResolveHost() diff --git a/client/ayon_core/hosts/resolve/utility_scripts/OpenPype__Menu.py b/client/ayon_core/hosts/resolve/utility_scripts/OpenPype__Menu.py index 4f14927074..08cefb9d61 100644 --- a/client/ayon_core/hosts/resolve/utility_scripts/OpenPype__Menu.py +++ b/client/ayon_core/hosts/resolve/utility_scripts/OpenPype__Menu.py @@ -1,14 +1,14 @@ import os import sys -from openpype.pipeline import install_host -from openpype.lib import Logger +from ayon_core.pipeline import install_host +from ayon_core.lib import Logger log = Logger.get_logger(__name__) def main(env): - from openpype.hosts.resolve.api import ResolveHost, launch_pype_menu + from ayon_core.hosts.resolve.api import ResolveHost, launch_pype_menu # activate resolve from openpype host = ResolveHost() diff --git a/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_export.py b/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_export.py index 0431eb7daa..c1c83eb060 100644 --- a/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_export.py +++ b/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_export.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import os -from openpype.hosts.resolve.otio import davinci_export as otio_export +from ayon_core.hosts.resolve.otio import davinci_export as otio_export resolve = bmd.scriptapp("Resolve") # noqa fu = resolve.Fusion() diff --git a/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_import.py b/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_import.py index d8b630eb2a..5bbdd73402 100644 --- a/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_import.py +++ b/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_import.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import os -from openpype.hosts.resolve.otio import davinci_import as otio_import +from ayon_core.hosts.resolve.otio import davinci_import as otio_import resolve = bmd.scriptapp("Resolve") # noqa fu = resolve.Fusion() diff --git a/client/ayon_core/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py b/client/ayon_core/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py index 8f3917bece..c394238860 100644 --- a/client/ayon_core/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py +++ b/client/ayon_core/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py @@ -2,12 +2,12 @@ import os import sys -from openpype.pipeline import install_host +from ayon_core.pipeline import install_host def main(env): - from openpype.hosts.resolve.utils import setup - import openpype.hosts.resolve.api as bmdvr + from ayon_core.hosts.resolve.utils import setup + import ayon_core.hosts.resolve.api as bmdvr # Registers openpype's Global pyblish plugins install_host(bmdvr) setup(env) diff --git a/client/ayon_core/hosts/resolve/utils.py b/client/ayon_core/hosts/resolve/utils.py index 9b91a14267..a3ae24ea9f 100644 --- a/client/ayon_core/hosts/resolve/utils.py +++ b/client/ayon_core/hosts/resolve/utils.py @@ -1,8 +1,8 @@ import os import shutil -from openpype.lib import Logger, is_running_from_build +from ayon_core.lib import Logger, is_running_from_build -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED RESOLVE_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/standalonepublisher/addon.py b/client/ayon_core/hosts/standalonepublisher/addon.py index 607c4ecdae..c357a65617 100644 --- a/client/ayon_core/hosts/standalonepublisher/addon.py +++ b/client/ayon_core/hosts/standalonepublisher/addon.py @@ -1,8 +1,8 @@ import os -from openpype.lib import get_openpype_execute_args -from openpype.lib.execute import run_detached_process -from openpype.modules import ( +from ayon_core.lib import get_openpype_execute_args +from ayon_core.lib.execute import run_detached_process +from ayon_core.modules import ( click_wrap, OpenPypeModule, ITrayAction, @@ -54,6 +54,6 @@ def cli_main(): def launch(): """Launch StandalonePublisher tool UI.""" - from openpype.tools import standalonepublish + from ayon_core.tools import standalonepublish standalonepublish.main() diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_bulk_mov_instances.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_bulk_mov_instances.py index 6c3b0c3efd..019ab95fa7 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_bulk_mov_instances.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_bulk_mov_instances.py @@ -2,8 +2,8 @@ import copy import json import pyblish.api -from openpype.client import get_asset_by_name -from openpype.pipeline.create import get_subset_name +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline.create import get_subset_name class CollectBulkMovInstances(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_context.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_context.py index 8fa53f5f48..c51bd8722a 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_context.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_context.py @@ -20,7 +20,7 @@ from pprint import pformat import clique import pyblish.api -from openpype.pipeline import legacy_io +from ayon_core.pipeline import legacy_io class CollectContextDataSAPublish(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_editorial.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_editorial.py index 391cace761..6a78ae093a 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_editorial.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_editorial.py @@ -18,8 +18,8 @@ Optional: import os import opentimelineio as otio import pyblish.api -from openpype import lib as plib -from openpype.pipeline.context_tools import get_current_project_asset +from ayon_core import lib as plib +from ayon_core.pipeline.context_tools import get_current_project_asset class OTIO_View(pyblish.api.Action): diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py index 75c260bad7..3aa59dba75 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py @@ -4,8 +4,8 @@ from copy import deepcopy import opentimelineio as otio import pyblish.api -from openpype import lib as plib -from openpype.pipeline.context_tools import get_current_project_asset +from ayon_core import lib as plib +from ayon_core.pipeline.context_tools import get_current_project_asset class CollectInstances(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py index eb06875601..244c38695c 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py @@ -4,7 +4,7 @@ import re from copy import deepcopy import pyblish.api -from openpype.client import get_asset_by_id +from ayon_core.client import get_asset_by_id class CollectHierarchyInstance(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_matching_asset.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_matching_asset.py index 82d7247b2b..426e015a90 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_matching_asset.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_matching_asset.py @@ -4,7 +4,7 @@ import collections import pyblish.api from pprint import pformat -from openpype.client import get_assets +from ayon_core.client import get_assets class CollectMatchingAssetToInstance(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_texture.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_texture.py index c1c48ec72d..b687d81e2e 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_texture.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/collect_texture.py @@ -3,7 +3,7 @@ import re import pyblish.api import json -from openpype.lib import ( +from ayon_core.lib import ( prepare_template_data, StringTemplate, ) diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/extract_thumbnail.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/extract_thumbnail.py index a2afd160fa..f7c76c9e32 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/extract_thumbnail.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/extract_thumbnail.py @@ -2,7 +2,7 @@ import os import subprocess import tempfile import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( get_ffmpeg_tool_args, get_ffprobe_streams, path_to_subprocess_arg, diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_editorial_resources.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_editorial_resources.py index 3d2b6d04ad..7ab29d1b17 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_editorial_resources.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_editorial_resources.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_frame_ranges.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_frame_ranges.py index e46fbe6098..7add98d954 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_frame_ranges.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_frame_ranges.py @@ -2,8 +2,8 @@ import re import pyblish.api -from openpype.pipeline.context_tools import get_current_project_asset -from openpype.pipeline.publish import ( +from ayon_core.pipeline.context_tools import get_current_project_asset +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_shot_duplicates.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_shot_duplicates.py index df04ae3b66..eed3177b4c 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_shot_duplicates.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_shot_duplicates.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_sources.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_sources.py index 1782f53de2..a0a0a43dcd 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_sources.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_sources.py @@ -2,7 +2,7 @@ import os import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_task_existence.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_task_existence.py index 19ea1a4778..e7c70d1131 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_task_existence.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_task_existence.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype.client import get_assets -from openpype.pipeline import PublishXmlValidationError +from ayon_core.client import get_assets +from ayon_core.pipeline import PublishXmlValidationError class ValidateTaskExistence(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_batch.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_batch.py index 44f69e48f7..fd3650b71d 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_batch.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_batch.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_has_workfile.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_has_workfile.py index f489d37f59..e43cd1a3b3 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_has_workfile.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_has_workfile.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_name.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_name.py index 22f4a0eafc..dca5fcc4aa 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_name.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_name.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_versions.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_versions.py index dab160d537..2209878abb 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_versions.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_versions.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_workfiles.py b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_workfiles.py index fd2d4a9f36..d6f2fd63a5 100644 --- a/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_workfiles.py +++ b/client/ayon_core/hosts/standalonepublisher/plugins/publish/validate_texture_workfiles.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, ) diff --git a/client/ayon_core/hosts/substancepainter/addon.py b/client/ayon_core/hosts/substancepainter/addon.py index 2fbea139c5..7fbe93aa21 100644 --- a/client/ayon_core/hosts/substancepainter/addon.py +++ b/client/ayon_core/hosts/substancepainter/addon.py @@ -1,5 +1,5 @@ import os -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon SUBSTANCE_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/substancepainter/api/pipeline.py b/client/ayon_core/hosts/substancepainter/api/pipeline.py index a13075127f..99a794480b 100644 --- a/client/ayon_core/hosts/substancepainter/api/pipeline.py +++ b/client/ayon_core/hosts/substancepainter/api/pipeline.py @@ -11,26 +11,26 @@ import substance_painter.project import pyblish.api -from openpype.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost -from openpype.settings import ( +from ayon_core.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost +from ayon_core.settings import ( get_current_project_settings, get_system_settings ) -from openpype.pipeline.template_data import get_template_data_with_names -from openpype.pipeline import ( +from ayon_core.pipeline.template_data import get_template_data_with_names +from ayon_core.pipeline import ( register_creator_plugin_path, register_loader_plugin_path, AVALON_CONTAINER_ID, Anatomy ) -from openpype.lib import ( +from ayon_core.lib import ( StringTemplate, register_event_callback, emit_event, ) -from openpype.pipeline.load import any_outdated_containers -from openpype.hosts.substancepainter import SUBSTANCE_HOST_DIR +from ayon_core.pipeline.load import any_outdated_containers +from ayon_core.hosts.substancepainter import SUBSTANCE_HOST_DIR from . import lib @@ -166,7 +166,7 @@ class SubstanceHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): def _install_menu(self): from PySide2 import QtWidgets - from openpype.tools.utils import host_tools + from ayon_core.tools.utils import host_tools parent = substance_painter.ui.get_main_window() @@ -285,7 +285,7 @@ def on_open(): log.info("Running callback on open..") if any_outdated_containers(): - from openpype.widgets import popup + from ayon_core.widgets import popup log.warning("Scene has outdated content.") @@ -298,7 +298,7 @@ def on_open(): # Show outdated pop-up def _on_show_inventory(): - from openpype.tools.utils import host_tools + from ayon_core.tools.utils import host_tools host_tools.show_scene_inventory(parent=parent) dialog = popup.Popup(parent=parent) diff --git a/client/ayon_core/hosts/substancepainter/deploy/plugins/openpype_plugin.py b/client/ayon_core/hosts/substancepainter/deploy/plugins/openpype_plugin.py index e7e1849546..8ced463367 100644 --- a/client/ayon_core/hosts/substancepainter/deploy/plugins/openpype_plugin.py +++ b/client/ayon_core/hosts/substancepainter/deploy/plugins/openpype_plugin.py @@ -21,13 +21,13 @@ def cleanup_openpype_qt_widgets(): def start_plugin(): - from openpype.pipeline import install_host - from openpype.hosts.substancepainter.api import SubstanceHost + from ayon_core.pipeline import install_host + from ayon_core.hosts.substancepainter.api import SubstanceHost install_host(SubstanceHost()) def close_plugin(): - from openpype.pipeline import uninstall_host + from ayon_core.pipeline import uninstall_host cleanup_openpype_qt_widgets() uninstall_host() diff --git a/client/ayon_core/hosts/substancepainter/plugins/create/create_textures.py b/client/ayon_core/hosts/substancepainter/plugins/create/create_textures.py index 6972ba2794..831ab6bb23 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/create/create_textures.py +++ b/client/ayon_core/hosts/substancepainter/plugins/create/create_textures.py @@ -1,21 +1,21 @@ # -*- coding: utf-8 -*- """Creator plugin for creating textures.""" -from openpype.pipeline import CreatedInstance, Creator, CreatorError -from openpype.lib import ( +from ayon_core.pipeline import CreatedInstance, Creator, CreatorError +from ayon_core.lib import ( EnumDef, UILabelDef, NumberDef, BoolDef ) -from openpype.hosts.substancepainter.api.pipeline import ( +from ayon_core.hosts.substancepainter.api.pipeline import ( get_instances, set_instance, set_instances, remove_instance ) -from openpype.hosts.substancepainter.api.lib import get_export_presets +from ayon_core.hosts.substancepainter.api.lib import get_export_presets import substance_painter.project diff --git a/client/ayon_core/hosts/substancepainter/plugins/create/create_workfile.py b/client/ayon_core/hosts/substancepainter/plugins/create/create_workfile.py index c73277e405..6a3e4a6068 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/create/create_workfile.py +++ b/client/ayon_core/hosts/substancepainter/plugins/create/create_workfile.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- """Creator plugin for creating workfiles.""" -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import CreatedInstance, AutoCreator -from openpype.client import get_asset_by_name +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import CreatedInstance, AutoCreator +from ayon_core.client import get_asset_by_name -from openpype.hosts.substancepainter.api.pipeline import ( +from ayon_core.hosts.substancepainter.api.pipeline import ( set_instances, set_instance, get_instances diff --git a/client/ayon_core/hosts/substancepainter/plugins/load/load_mesh.py b/client/ayon_core/hosts/substancepainter/plugins/load/load_mesh.py index 08c1d5c391..48aa99d357 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/load/load_mesh.py +++ b/client/ayon_core/hosts/substancepainter/plugins/load/load_mesh.py @@ -1,14 +1,14 @@ -from openpype.pipeline import ( +from ayon_core.pipeline import ( load, get_representation_path, ) -from openpype.pipeline.load import LoadError -from openpype.hosts.substancepainter.api.pipeline import ( +from ayon_core.pipeline.load import LoadError +from ayon_core.hosts.substancepainter.api.pipeline import ( imprint_container, set_container_metadata, remove_container_metadata ) -from openpype.hosts.substancepainter.api.lib import prompt_new_file_with_mesh +from ayon_core.hosts.substancepainter.api.lib import prompt_new_file_with_mesh import substance_painter.project import qargparse diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/collect_current_file.py b/client/ayon_core/hosts/substancepainter/plugins/publish/collect_current_file.py index 9a37eb0d1c..db0edafac0 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/publish/collect_current_file.py +++ b/client/ayon_core/hosts/substancepainter/plugins/publish/collect_current_file.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline import registered_host +from ayon_core.pipeline import registered_host class CollectCurrentFile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py b/client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py index 316f72509e..b8279c99cd 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py +++ b/client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py @@ -2,15 +2,15 @@ import os import copy import pyblish.api -from openpype.pipeline import publish +from ayon_core.pipeline import publish import substance_painter.textureset -from openpype.hosts.substancepainter.api.lib import ( +from ayon_core.hosts.substancepainter.api.lib import ( get_parsed_export_maps, strip_template ) -from openpype.pipeline.create import get_subset_name -from openpype.client import get_asset_by_name +from ayon_core.pipeline.create import get_subset_name +from ayon_core.client import get_asset_by_name class CollectTextureSet(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/extract_textures.py b/client/ayon_core/hosts/substancepainter/plugins/publish/extract_textures.py index bb6f15ead9..0fa7b52f45 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/publish/extract_textures.py +++ b/client/ayon_core/hosts/substancepainter/plugins/publish/extract_textures.py @@ -1,6 +1,6 @@ import substance_painter.export -from openpype.pipeline import KnownPublishError, publish +from ayon_core.pipeline import KnownPublishError, publish class ExtractTextures(publish.Extractor, diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/increment_workfile.py b/client/ayon_core/hosts/substancepainter/plugins/publish/increment_workfile.py index b45d66fbb1..521a28130b 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/publish/increment_workfile.py +++ b/client/ayon_core/hosts/substancepainter/plugins/publish/increment_workfile.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype.lib import version_up -from openpype.pipeline import registered_host +from ayon_core.lib import version_up +from ayon_core.pipeline import registered_host class IncrementWorkfileVersion(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/save_workfile.py b/client/ayon_core/hosts/substancepainter/plugins/publish/save_workfile.py index 517f5fd17f..627fb991aa 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/publish/save_workfile.py +++ b/client/ayon_core/hosts/substancepainter/plugins/publish/save_workfile.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( registered_host, KnownPublishError ) diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/validate_ouput_maps.py b/client/ayon_core/hosts/substancepainter/plugins/publish/validate_ouput_maps.py index 252683b6c8..720771994c 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/publish/validate_ouput_maps.py +++ b/client/ayon_core/hosts/substancepainter/plugins/publish/validate_ouput_maps.py @@ -5,7 +5,7 @@ import pyblish.api import substance_painter.export -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateOutputMaps(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/traypublisher/addon.py b/client/ayon_core/hosts/traypublisher/addon.py index ca60760bab..2a79f9e855 100644 --- a/client/ayon_core/hosts/traypublisher/addon.py +++ b/client/ayon_core/hosts/traypublisher/addon.py @@ -1,8 +1,8 @@ import os -from openpype.lib import get_openpype_execute_args -from openpype.lib.execute import run_detached_process -from openpype.modules import ( +from ayon_core.lib import get_openpype_execute_args +from ayon_core.lib.execute import run_detached_process +from ayon_core.modules import ( click_wrap, OpenPypeModule, ITrayAction, @@ -55,6 +55,6 @@ def cli_main(): def launch(): """Launch TrayPublish tool UI.""" - from openpype.tools import traypublisher + from ayon_core.tools import traypublisher traypublisher.main() diff --git a/client/ayon_core/hosts/traypublisher/api/editorial.py b/client/ayon_core/hosts/traypublisher/api/editorial.py index 613f1de768..d84a7200c8 100644 --- a/client/ayon_core/hosts/traypublisher/api/editorial.py +++ b/client/ayon_core/hosts/traypublisher/api/editorial.py @@ -1,8 +1,8 @@ import re from copy import deepcopy -from openpype.client import get_asset_by_id -from openpype.pipeline.create import CreatorError +from ayon_core.client import get_asset_by_id +from ayon_core.pipeline.create import CreatorError class ShotMetadataSolver: diff --git a/client/ayon_core/hosts/traypublisher/api/pipeline.py b/client/ayon_core/hosts/traypublisher/api/pipeline.py index 3264f52b0f..87177705c9 100644 --- a/client/ayon_core/hosts/traypublisher/api/pipeline.py +++ b/client/ayon_core/hosts/traypublisher/api/pipeline.py @@ -5,11 +5,11 @@ import atexit import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( register_creator_plugin_path, legacy_io, ) -from openpype.host import HostBase, IPublishHost +from ayon_core.host import HostBase, IPublishHost ROOT_DIR = os.path.dirname(os.path.dirname( diff --git a/client/ayon_core/hosts/traypublisher/api/plugin.py b/client/ayon_core/hosts/traypublisher/api/plugin.py index 6859b85a46..f1baf1ab2a 100644 --- a/client/ayon_core/hosts/traypublisher/api/plugin.py +++ b/client/ayon_core/hosts/traypublisher/api/plugin.py @@ -1,18 +1,18 @@ -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_assets, get_subsets, get_last_versions, get_asset_name_identifier, ) -from openpype.lib.attribute_definitions import ( +from ayon_core.lib.attribute_definitions import ( FileDef, BoolDef, NumberDef, UISeparatorDef, ) -from openpype.lib.transcoding import IMAGE_EXTENSIONS, VIDEO_EXTENSIONS -from openpype.pipeline.create import ( +from ayon_core.lib.transcoding import IMAGE_EXTENSIONS, VIDEO_EXTENSIONS +from ayon_core.pipeline.create import ( Creator, HiddenCreator, CreatedInstance, diff --git a/client/ayon_core/hosts/traypublisher/batch_parsing.py b/client/ayon_core/hosts/traypublisher/batch_parsing.py index 3ce3b095b9..fdb3021a20 100644 --- a/client/ayon_core/hosts/traypublisher/batch_parsing.py +++ b/client/ayon_core/hosts/traypublisher/batch_parsing.py @@ -2,8 +2,8 @@ import os import re -from openpype.lib import Logger -from openpype.client import get_assets, get_asset_by_name +from ayon_core.lib import Logger +from ayon_core.client import get_assets, get_asset_by_name def get_asset_doc_from_file_name(source_filename, project_name, diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py index ac4c72a0ce..b071b2a18f 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py +++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py @@ -6,17 +6,17 @@ production type `ociolook`. All files are published as representation. """ from pathlib import Path -from openpype import AYON_SERVER_ENABLED -from openpype.client import get_asset_by_name -from openpype.lib.attribute_definitions import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import get_asset_by_name +from ayon_core.lib.attribute_definitions import ( FileDef, EnumDef, TextDef, UISeparatorDef ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( CreatedInstance, CreatorError ) -from openpype.pipeline import colorspace -from openpype.hosts.traypublisher.api.plugin import TrayPublishCreator +from ayon_core.pipeline import colorspace +from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator class CreateColorspaceLook(TrayPublishCreator): diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py index dce4a051fd..c2ffdb2ce0 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py +++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py @@ -1,20 +1,20 @@ import os from copy import deepcopy import opentimelineio as otio -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_asset_by_name, get_project ) -from openpype.hosts.traypublisher.api.plugin import ( +from ayon_core.hosts.traypublisher.api.plugin import ( TrayPublishCreator, HiddenTrayPublishCreator ) -from openpype.hosts.traypublisher.api.editorial import ( +from ayon_core.hosts.traypublisher.api.editorial import ( ShotMetadataSolver ) -from openpype.pipeline import CreatedInstance -from openpype.lib import ( +from ayon_core.pipeline import CreatedInstance +from ayon_core.lib import ( get_ffprobe_data, convert_ffprobe_fps_value, diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py index df6253b0c2..20f8dd792a 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py +++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py @@ -1,12 +1,12 @@ import os -from openpype.lib import Logger -from openpype.settings import get_project_settings +from ayon_core.lib import Logger +from ayon_core.settings import get_project_settings log = Logger.get_logger(__name__) def initialize(): - from openpype.hosts.traypublisher.api.plugin import SettingsCreator + from ayon_core.hosts.traypublisher.api.plugin import SettingsCreator project_name = os.environ["AVALON_PROJECT"] project_settings = get_project_settings(project_name) diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py index 8fa65c7fff..4ef03bd551 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py +++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py @@ -2,22 +2,22 @@ import copy import os import re -from openpype import AYON_SERVER_ENABLED -from openpype.client import get_asset_name_identifier -from openpype.lib import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import get_asset_name_identifier +from ayon_core.lib import ( FileDef, BoolDef, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( CreatedInstance, ) -from openpype.pipeline.create import ( +from ayon_core.pipeline.create import ( get_subset_name, TaskNotSetError, ) -from openpype.hosts.traypublisher.api.plugin import TrayPublishCreator -from openpype.hosts.traypublisher.batch_parsing import ( +from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator +from ayon_core.hosts.traypublisher.batch_parsing import ( get_asset_doc_from_file_name ) diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py index 199fae6d2c..db11d30afe 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py +++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py @@ -7,13 +7,13 @@ exists under selected asset. """ from pathlib import Path -# from openpype.client import get_subset_by_name, get_asset_by_name -from openpype.lib.attribute_definitions import FileDef, BoolDef -from openpype.pipeline import ( +# from ayon_core.client import get_subset_by_name, get_asset_by_name +from ayon_core.lib.attribute_definitions import FileDef, BoolDef +from ayon_core.pipeline import ( CreatedInstance, CreatorError ) -from openpype.hosts.traypublisher.api.plugin import TrayPublishCreator +from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator class OnlineCreator(TrayPublishCreator): diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py index 6aede099bf..96b215829f 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py @@ -1,8 +1,8 @@ import os from pprint import pformat import pyblish.api -from openpype.pipeline import publish -from openpype.pipeline import colorspace +from ayon_core.pipeline import publish +from ayon_core.pipeline import colorspace class CollectColorspaceLook(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py index 75c26ac958..346131ac44 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py @@ -1,11 +1,11 @@ import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( publish, registered_host ) -from openpype.lib import EnumDef -from openpype.pipeline import colorspace -from openpype.pipeline.publish import KnownPublishError +from ayon_core.lib import EnumDef +from ayon_core.pipeline import colorspace +from ayon_core.pipeline.publish import KnownPublishError class CollectColorspace(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py index 5f8b2878b7..da33b9bfbd 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py @@ -1,7 +1,7 @@ import os import pyblish.api -from openpype.pipeline import OpenPypePyblishPluginMixin +from ayon_core.pipeline import OpenPypePyblishPluginMixin class CollectMovieBatch( diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_sequence_frame_data.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_sequence_frame_data.py index 5e60a94927..7eded0f6f5 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_sequence_frame_data.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_sequence_frame_data.py @@ -1,7 +1,7 @@ import pyblish.api import clique -from openpype.pipeline import OptionalPyblishPluginMixin +from ayon_core.pipeline import OptionalPyblishPluginMixin class CollectSequenceFrameData( diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py index b99b634da1..5137eaa72b 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py @@ -2,7 +2,7 @@ from pprint import pformat import pyblish.api import opentimelineio as otio -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED class CollectShotInstance(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py index f94bbc7a49..4d1bdbdbfc 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py @@ -1,7 +1,7 @@ import os import json import pyblish.api -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractColorspaceLook(publish.Extractor, diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py index 58c40938d2..3a63db4af1 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py @@ -1,11 +1,11 @@ import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( publish, PublishValidationError ) -from openpype.pipeline.colorspace import ( +from ayon_core.pipeline.colorspace import ( get_ocio_config_colorspaces ) diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py index 548ce9d15a..3f30e03388 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( publish, PublishValidationError ) diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py index 1fb27acdeb..6a85f92ce1 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, OptionalPyblishPluginMixin, diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py index b67e47d213..4a4f3dae69 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py @@ -1,6 +1,6 @@ import os import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateFilePath(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_frame_ranges.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_frame_ranges.py index 56389a927f..cd4a98b84d 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_frame_ranges.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_frame_ranges.py @@ -2,7 +2,7 @@ import re import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishXmlValidationError, OptionalPyblishPluginMixin, diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py index 2db865ca2b..e655578095 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError, OptionalPyblishPluginMixin, ) -from openpype.client import get_subset_by_name +from ayon_core.client import get_subset_by_name class ValidateOnlineFile(OptionalPyblishPluginMixin, diff --git a/client/ayon_core/hosts/tvpaint/addon.py b/client/ayon_core/hosts/tvpaint/addon.py index b695bf8ecc..d9f3b219ab 100644 --- a/client/ayon_core/hosts/tvpaint/addon.py +++ b/client/ayon_core/hosts/tvpaint/addon.py @@ -1,5 +1,5 @@ import os -from openpype.modules import OpenPypeModule, IHostAddon +from ayon_core.modules import OpenPypeModule, IHostAddon TVPAINT_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/tvpaint/api/communication_server.py b/client/ayon_core/hosts/tvpaint/api/communication_server.py index 2c4d8160a6..7a95242463 100644 --- a/client/ayon_core/hosts/tvpaint/api/communication_server.py +++ b/client/ayon_core/hosts/tvpaint/api/communication_server.py @@ -21,9 +21,9 @@ from aiohttp_json_rpc.protocol import ( ) from aiohttp_json_rpc.exceptions import RpcError -from openpype import AYON_SERVER_ENABLED -from openpype.lib import emit_event -from openpype.hosts.tvpaint.tvpaint_plugin import get_plugin_files_path +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.lib import emit_event +from ayon_core.hosts.tvpaint.tvpaint_plugin import get_plugin_files_path log = logging.getLogger(__name__) log.setLevel(logging.DEBUG) @@ -301,7 +301,7 @@ class QtTVPaintRpc(BaseTVPaintRpc): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - from openpype.tools.utils import host_tools + from ayon_core.tools.utils import host_tools self.tools_helper = host_tools.HostToolsHelper() route_name = self.route_name diff --git a/client/ayon_core/hosts/tvpaint/api/launch_script.py b/client/ayon_core/hosts/tvpaint/api/launch_script.py index 614dbe8a6e..bcc92d8b6d 100644 --- a/client/ayon_core/hosts/tvpaint/api/launch_script.py +++ b/client/ayon_core/hosts/tvpaint/api/launch_script.py @@ -8,9 +8,9 @@ import logging from qtpy import QtWidgets, QtCore, QtGui -from openpype import style -from openpype.pipeline import install_host -from openpype.hosts.tvpaint.api import ( +from ayon_core import style +from ayon_core.pipeline import install_host +from ayon_core.hosts.tvpaint.api import ( TVPaintHost, CommunicationWrapper, ) diff --git a/client/ayon_core/hosts/tvpaint/api/pipeline.py b/client/ayon_core/hosts/tvpaint/api/pipeline.py index c125da1533..43df49badf 100644 --- a/client/ayon_core/hosts/tvpaint/api/pipeline.py +++ b/client/ayon_core/hosts/tvpaint/api/pipeline.py @@ -7,18 +7,18 @@ import requests import pyblish.api -from openpype.client import get_asset_by_name -from openpype.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost -from openpype.hosts.tvpaint import TVPAINT_ROOT_DIR -from openpype.settings import get_current_project_settings -from openpype.lib import register_event_callback -from openpype.pipeline import ( +from ayon_core.client import get_asset_by_name +from ayon_core.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost +from ayon_core.hosts.tvpaint import TVPAINT_ROOT_DIR +from ayon_core.settings import get_current_project_settings +from ayon_core.lib import register_event_callback +from ayon_core.pipeline import ( legacy_io, register_loader_plugin_path, register_creator_plugin_path, AVALON_CONTAINER_ID, ) -from openpype.pipeline.context_tools import get_global_context +from ayon_core.pipeline.context_tools import get_global_context from .lib import ( execute_george, diff --git a/client/ayon_core/hosts/tvpaint/api/plugin.py b/client/ayon_core/hosts/tvpaint/api/plugin.py index 96b99199f2..88a0e74528 100644 --- a/client/ayon_core/hosts/tvpaint/api/plugin.py +++ b/client/ayon_core/hosts/tvpaint/api/plugin.py @@ -1,13 +1,13 @@ import re -from openpype.pipeline import LoaderPlugin -from openpype.pipeline.create import ( +from ayon_core.pipeline import LoaderPlugin +from ayon_core.pipeline.create import ( CreatedInstance, get_subset_name, AutoCreator, Creator, ) -from openpype.pipeline.create.creator_plugins import cache_and_get_instances +from ayon_core.pipeline.create.creator_plugins import cache_and_get_instances from .lib import get_layers_data diff --git a/client/ayon_core/hosts/tvpaint/hooks/pre_launch_args.py b/client/ayon_core/hosts/tvpaint/hooks/pre_launch_args.py index a1c946b60b..bddf875d02 100644 --- a/client/ayon_core/hosts/tvpaint/hooks/pre_launch_args.py +++ b/client/ayon_core/hosts/tvpaint/hooks/pre_launch_args.py @@ -1,5 +1,5 @@ -from openpype.lib import get_openpype_execute_args -from openpype.lib.applications import PreLaunchHook, LaunchTypes +from ayon_core.lib import get_openpype_execute_args +from ayon_core.lib.applications import PreLaunchHook, LaunchTypes class TvpaintPrelaunchHook(PreLaunchHook): @@ -37,6 +37,6 @@ class TvpaintPrelaunchHook(PreLaunchHook): self.launch_context.launch_args.extend(remainders) def launch_script_path(self): - from openpype.hosts.tvpaint import get_launch_script_path + from ayon_core.hosts.tvpaint import get_launch_script_path return get_launch_script_path() diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py b/client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py index 5cfa1faa50..d3c6c06c8a 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py +++ b/client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py @@ -1,11 +1,11 @@ import collections -from openpype.pipeline.create.creator_plugins import ( +from ayon_core.pipeline.create.creator_plugins import ( SubsetConvertorPlugin, cache_and_get_instances, ) -from openpype.hosts.tvpaint.api.plugin import SHARED_DATA_KEY -from openpype.hosts.tvpaint.api.lib import get_groups_data +from ayon_core.hosts.tvpaint.api.plugin import SHARED_DATA_KEY +from ayon_core.hosts.tvpaint.api.lib import get_groups_data class TVPaintLegacyConverted(SubsetConvertorPlugin): diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_render.py b/client/ayon_core/hosts/tvpaint/plugins/create/create_render.py index 667103432e..cb13c77ca6 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/create/create_render.py +++ b/client/ayon_core/hosts/tvpaint/plugins/create/create_render.py @@ -37,9 +37,9 @@ Todos: import collections from typing import Any, Optional, Union -from openpype import AYON_SERVER_ENABLED -from openpype.client import get_asset_by_name, get_asset_name_identifier -from openpype.lib import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import get_asset_by_name, get_asset_name_identifier +from ayon_core.lib import ( prepare_template_data, AbstractAttrDef, UILabelDef, @@ -48,15 +48,15 @@ from openpype.lib import ( TextDef, BoolDef, ) -from openpype.pipeline.create import ( +from ayon_core.pipeline.create import ( CreatedInstance, CreatorError, ) -from openpype.hosts.tvpaint.api.plugin import ( +from ayon_core.hosts.tvpaint.api.plugin import ( TVPaintCreator, TVPaintAutoCreator, ) -from openpype.hosts.tvpaint.api.lib import ( +from ayon_core.hosts.tvpaint.api.lib import ( get_layers_data, get_groups_data, execute_george_through_file, diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_review.py b/client/ayon_core/hosts/tvpaint/plugins/create/create_review.py index 5caf20f27d..59071f5377 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/create/create_review.py +++ b/client/ayon_core/hosts/tvpaint/plugins/create/create_review.py @@ -1,7 +1,7 @@ -from openpype import AYON_SERVER_ENABLED -from openpype.client import get_asset_by_name -from openpype.pipeline import CreatedInstance -from openpype.hosts.tvpaint.api.plugin import TVPaintAutoCreator +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline import CreatedInstance +from ayon_core.hosts.tvpaint.api.plugin import TVPaintAutoCreator class TVPaintReviewCreator(TVPaintAutoCreator): diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py b/client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py index 4ce5d7fc96..75cb691c77 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py +++ b/client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py @@ -1,7 +1,7 @@ -from openpype import AYON_SERVER_ENABLED -from openpype.client import get_asset_by_name -from openpype.pipeline import CreatedInstance -from openpype.hosts.tvpaint.api.plugin import TVPaintAutoCreator +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline import CreatedInstance +from ayon_core.hosts.tvpaint.api.plugin import TVPaintAutoCreator class TVPaintWorkfileCreator(TVPaintAutoCreator): diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_image.py b/client/ayon_core/hosts/tvpaint/plugins/load/load_image.py index a400738019..924c0f2835 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/load/load_image.py +++ b/client/ayon_core/hosts/tvpaint/plugins/load/load_image.py @@ -1,6 +1,6 @@ -from openpype.lib.attribute_definitions import BoolDef -from openpype.hosts.tvpaint.api import plugin -from openpype.hosts.tvpaint.api.lib import execute_george_through_file +from ayon_core.lib.attribute_definitions import BoolDef +from ayon_core.hosts.tvpaint.api import plugin +from ayon_core.hosts.tvpaint.api.lib import execute_george_through_file class ImportImage(plugin.Loader): diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py b/client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py index 53061c6885..0a12e93f44 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py +++ b/client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py @@ -1,16 +1,16 @@ import collections -from openpype.lib.attribute_definitions import BoolDef -from openpype.pipeline import ( +from ayon_core.lib.attribute_definitions import BoolDef +from ayon_core.pipeline import ( get_representation_context, register_host, ) -from openpype.hosts.tvpaint.api import plugin -from openpype.hosts.tvpaint.api.lib import ( +from ayon_core.hosts.tvpaint.api import plugin +from ayon_core.hosts.tvpaint.api.lib import ( get_layers_data, execute_george_through_file, ) -from openpype.hosts.tvpaint.api.pipeline import ( +from ayon_core.hosts.tvpaint.api.pipeline import ( write_workfile_metadata, SECTION_NAME_CONTAINERS, containerise, diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_sound.py b/client/ayon_core/hosts/tvpaint/plugins/load/load_sound.py index 3003280eef..86f3e6857f 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/load/load_sound.py +++ b/client/ayon_core/hosts/tvpaint/plugins/load/load_sound.py @@ -1,7 +1,7 @@ import os import tempfile -from openpype.hosts.tvpaint.api import plugin -from openpype.hosts.tvpaint.api.lib import ( +from ayon_core.hosts.tvpaint.api import plugin +from ayon_core.hosts.tvpaint.api.lib import ( execute_george_through_file, ) diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py b/client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py index 169bfdcdd8..e29ecfd442 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py +++ b/client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py @@ -1,24 +1,24 @@ import os -from openpype.lib import StringTemplate -from openpype.pipeline import ( +from ayon_core.lib import StringTemplate +from ayon_core.pipeline import ( registered_host, get_current_context, Anatomy, ) -from openpype.pipeline.workfile import ( +from ayon_core.pipeline.workfile import ( get_workfile_template_key_from_context, get_last_workfile_with_version, ) -from openpype.pipeline.template_data import get_template_data_with_names -from openpype.hosts.tvpaint.api import plugin -from openpype.hosts.tvpaint.api.lib import ( +from ayon_core.pipeline.template_data import get_template_data_with_names +from ayon_core.hosts.tvpaint.api import plugin +from ayon_core.hosts.tvpaint.api.lib import ( execute_george_through_file, ) -from openpype.hosts.tvpaint.api.pipeline import ( +from ayon_core.hosts.tvpaint.api.pipeline import ( get_current_workfile_context, ) -from openpype.pipeline.version_start import get_versioning_start +from ayon_core.pipeline.version_start import get_versioning_start class LoadWorkfile(plugin.Loader): diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py index 577e6e30e2..029c4b7e18 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py @@ -1,6 +1,6 @@ import copy import pyblish.api -from openpype.lib import prepare_template_data +from ayon_core.lib import prepare_template_data class CollectRenderInstances(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py index 56b51c812a..9fbf67863a 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py @@ -4,14 +4,14 @@ import tempfile import pyblish.api -from openpype.pipeline import legacy_io -from openpype.hosts.tvpaint.api.lib import ( +from ayon_core.pipeline import legacy_io +from ayon_core.hosts.tvpaint.api.lib import ( execute_george, execute_george_through_file, get_layers_data, get_groups_data, ) -from openpype.hosts.tvpaint.api.pipeline import ( +from ayon_core.hosts.tvpaint.api.pipeline import ( SECTION_NAME_CONTEXT, SECTION_NAME_INSTANCES, SECTION_NAME_CONTAINERS, diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_convert_to_exr.py b/client/ayon_core/hosts/tvpaint/plugins/publish/extract_convert_to_exr.py index c10fc4de97..d1bc68ef35 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_convert_to_exr.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/extract_convert_to_exr.py @@ -8,12 +8,12 @@ import os import json import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( get_oiio_tool_args, ToolNotFoundError, run_subprocess, ) -from openpype.pipeline import KnownPublishError +from ayon_core.pipeline import KnownPublishError class ExtractConvertToEXR(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py b/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py index fd568b2826..6d54d8ec32 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py @@ -6,17 +6,17 @@ from PIL import Image import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( KnownPublishError, get_publish_instance_families, ) -from openpype.hosts.tvpaint.api.lib import ( +from ayon_core.hosts.tvpaint.api.lib import ( execute_george, execute_george_through_file, get_layers_pre_post_behavior, get_layers_exposure_frames, ) -from openpype.hosts.tvpaint.lib import ( +from ayon_core.hosts.tvpaint.lib import ( calculate_layers_extraction_data, get_frame_filename_template, fill_reference_frames, diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/increment_workfile_version.py b/client/ayon_core/hosts/tvpaint/plugins/publish/increment_workfile_version.py index a85caf2557..5dd6110bc7 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/increment_workfile_version.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/increment_workfile_version.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype.lib import version_up -from openpype.pipeline import registered_host +from ayon_core.lib import version_up +from ayon_core.pipeline import registered_host class IncrementWorkfileVersion(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py index dc29e6c278..83af6927cf 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py @@ -1,10 +1,10 @@ import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import ( PublishXmlValidationError, OptionalPyblishPluginMixin, ) -from openpype.hosts.tvpaint.api.pipeline import ( +from ayon_core.hosts.tvpaint.api.pipeline import ( list_instances, write_instances, ) diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py index 722d76b4d2..aab0557bdd 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline import PublishXmlValidationError +from ayon_core.pipeline import PublishXmlValidationError class ValidateLayersGroup(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_layers_visibility.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_layers_visibility.py index 8e52a636f4..1bcdf7baa1 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_layers_visibility.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_layers_visibility.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline import PublishXmlValidationError +from ayon_core.pipeline import PublishXmlValidationError # TODO @iLLiCiTiT add repair action to disable instances? diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_marks.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_marks.py index 7b2cc62bb5..6bfbe840bb 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_marks.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_marks.py @@ -1,11 +1,11 @@ import json import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishXmlValidationError, OptionalPyblishPluginMixin, ) -from openpype.hosts.tvpaint.api.lib import execute_george +from ayon_core.hosts.tvpaint.api.lib import execute_george class ValidateMarksRepair(pyblish.api.Action): diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_missing_layer_names.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_missing_layer_names.py index 294ce6cf4f..3fc80f6e78 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_missing_layer_names.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_missing_layer_names.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline import PublishXmlValidationError +from ayon_core.pipeline import PublishXmlValidationError class ValidateMissingLayers(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py index bb0a9a4ffe..66793cbc7f 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py @@ -1,6 +1,6 @@ import collections import pyblish.api -from openpype.pipeline import PublishXmlValidationError +from ayon_core.pipeline import PublishXmlValidationError class ValidateRenderLayerGroups(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_pass_group.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_pass_group.py index 2a3173c698..874af38dd4 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_pass_group.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_pass_group.py @@ -1,6 +1,6 @@ import collections import pyblish.api -from openpype.pipeline import PublishXmlValidationError +from ayon_core.pipeline import PublishXmlValidationError class ValidateLayersGroup(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_scene_settings.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_scene_settings.py index 0ab8e811f5..2268e59d88 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_scene_settings.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_scene_settings.py @@ -1,7 +1,7 @@ import json import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishXmlValidationError, OptionalPyblishPluginMixin, ) diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_start_frame.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_start_frame.py index 229ccfcd18..fea64bd6a8 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_start_frame.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_start_frame.py @@ -1,9 +1,9 @@ import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishXmlValidationError, OptionalPyblishPluginMixin, ) -from openpype.hosts.tvpaint.api.lib import execute_george +from ayon_core.hosts.tvpaint.api.lib import execute_george class RepairStartFrame(pyblish.api.Action): diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py index b38231e208..bdc46d02cd 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishXmlValidationError, PublishValidationError, registered_host, diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py index 2ed5afa11c..be3259bfd8 100644 --- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py +++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline import PublishXmlValidationError +from ayon_core.pipeline import PublishXmlValidationError class ValidateWorkfileProjectName(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/tvpaint/worker/worker.py b/client/ayon_core/hosts/tvpaint/worker/worker.py index 9295c8afb4..3d9b1ef2b8 100644 --- a/client/ayon_core/hosts/tvpaint/worker/worker.py +++ b/client/ayon_core/hosts/tvpaint/worker/worker.py @@ -5,7 +5,7 @@ import tempfile import shutil import asyncio -from openpype.hosts.tvpaint.api.communication_server import ( +from ayon_core.hosts.tvpaint.api.communication_server import ( BaseCommunicator, CommunicationWrapper ) diff --git a/client/ayon_core/hosts/tvpaint/worker/worker_job.py b/client/ayon_core/hosts/tvpaint/worker/worker_job.py index 95c0a678bc..c5240dbafb 100644 --- a/client/ayon_core/hosts/tvpaint/worker/worker_job.py +++ b/client/ayon_core/hosts/tvpaint/worker/worker_job.py @@ -9,8 +9,8 @@ from abc import ABCMeta, abstractmethod, abstractproperty import six -from openpype.lib import Logger -from openpype.modules import ModulesManager +from ayon_core.lib import Logger +from ayon_core.modules import ModulesManager TMP_FILE_PREFIX = "opw_tvp_" @@ -256,7 +256,7 @@ class CollectSceneData(BaseCommand): name = "collect_scene_data" def execute(self): - from openpype.hosts.tvpaint.api.lib import ( + from ayon_core.hosts.tvpaint.api.lib import ( get_layers_data, get_groups_data, get_layers_pre_post_behavior, diff --git a/client/ayon_core/hosts/unreal/addon.py b/client/ayon_core/hosts/unreal/addon.py index fcc5d98ab6..3cc695ba99 100644 --- a/client/ayon_core/hosts/unreal/addon.py +++ b/client/ayon_core/hosts/unreal/addon.py @@ -1,6 +1,6 @@ import os import re -from openpype.modules import IHostAddon, OpenPypeModule +from ayon_core.modules import IHostAddon, OpenPypeModule UNREAL_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -25,7 +25,7 @@ class UnrealAddon(OpenPypeModule, IHostAddon): from .lib import get_compatible_integration - from openpype.widgets.message_window import Window + from ayon_core.widgets.message_window import Window pattern = re.compile(r'^\d+-\d+$') diff --git a/client/ayon_core/hosts/unreal/api/pipeline.py b/client/ayon_core/hosts/unreal/api/pipeline.py index f2d7b5f73e..a045986033 100644 --- a/client/ayon_core/hosts/unreal/api/pipeline.py +++ b/client/ayon_core/hosts/unreal/api/pipeline.py @@ -9,8 +9,8 @@ import time import pyblish.api -from openpype.client import get_asset_by_name, get_assets -from openpype.pipeline import ( +from ayon_core.client import get_asset_by_name, get_assets +from ayon_core.pipeline import ( register_loader_plugin_path, register_creator_plugin_path, register_inventory_action_path, @@ -20,9 +20,9 @@ from openpype.pipeline import ( AYON_CONTAINER_ID, legacy_io, ) -from openpype.tools.utils import host_tools -import openpype.hosts.unreal -from openpype.host import HostBase, ILoadHost, IPublishHost +from ayon_core.tools.utils import host_tools +import ayon_core.hosts.unreal +from ayon_core.host import HostBase, ILoadHost, IPublishHost import unreal # noqa @@ -324,7 +324,7 @@ def show_tools_popup(): Popup will disappear on click or losing focus. """ - from openpype.hosts.unreal.api import tools_ui + from ayon_core.hosts.unreal.api import tools_ui tools_ui.show_tools_popup() @@ -334,7 +334,7 @@ def show_tools_dialog(): Dialog will stay visible. """ - from openpype.hosts.unreal.api import tools_ui + from ayon_core.hosts.unreal.api import tools_ui tools_ui.show_tools_dialog() diff --git a/client/ayon_core/hosts/unreal/api/plugin.py b/client/ayon_core/hosts/unreal/api/plugin.py index 26ef69af86..ddf54f6c79 100644 --- a/client/ayon_core/hosts/unreal/api/plugin.py +++ b/client/ayon_core/hosts/unreal/api/plugin.py @@ -16,11 +16,11 @@ from .pipeline import ( ls_inst, UNREAL_VERSION ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef, UILabelDef ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( Creator, LoaderPlugin, CreatorError, diff --git a/client/ayon_core/hosts/unreal/api/rendering.py b/client/ayon_core/hosts/unreal/api/rendering.py index efe6fc54ad..279c34baf7 100644 --- a/client/ayon_core/hosts/unreal/api/rendering.py +++ b/client/ayon_core/hosts/unreal/api/rendering.py @@ -2,10 +2,10 @@ import os import unreal -from openpype.settings import get_project_settings -from openpype.pipeline import Anatomy -from openpype.hosts.unreal.api import pipeline -from openpype.widgets.message_window import Window +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import Anatomy +from ayon_core.hosts.unreal.api import pipeline +from ayon_core.widgets.message_window import Window queue = None diff --git a/client/ayon_core/hosts/unreal/api/tools_ui.py b/client/ayon_core/hosts/unreal/api/tools_ui.py index 5a4c689918..525df44240 100644 --- a/client/ayon_core/hosts/unreal/api/tools_ui.py +++ b/client/ayon_core/hosts/unreal/api/tools_ui.py @@ -1,13 +1,13 @@ import sys from qtpy import QtWidgets, QtCore, QtGui -from openpype import ( +from ayon_core import ( resources, style ) -from openpype.tools.utils import host_tools -from openpype.tools.utils.lib import qt_app_context -from openpype.hosts.unreal.api import rendering +from ayon_core.tools.utils import host_tools +from ayon_core.tools.utils.lib import qt_app_context +from ayon_core.hosts.unreal.api import rendering class ToolsBtnsWidget(QtWidgets.QWidget): diff --git a/client/ayon_core/hosts/unreal/hooks/pre_workfile_preparation.py b/client/ayon_core/hosts/unreal/hooks/pre_workfile_preparation.py index a635bd4cab..4317844ca5 100644 --- a/client/ayon_core/hosts/unreal/hooks/pre_workfile_preparation.py +++ b/client/ayon_core/hosts/unreal/hooks/pre_workfile_preparation.py @@ -8,19 +8,19 @@ from pathlib import Path from qtpy import QtCore -from openpype import resources -from openpype.lib.applications import ( +from ayon_core import resources +from ayon_core.lib.applications import ( PreLaunchHook, ApplicationLaunchFailed, LaunchTypes, ) -from openpype.pipeline.workfile import get_workfile_template_key -import openpype.hosts.unreal.lib as unreal_lib -from openpype.hosts.unreal.ue_workers import ( +from ayon_core.pipeline.workfile import get_workfile_template_key +import ayon_core.hosts.unreal.lib as unreal_lib +from ayon_core.hosts.unreal.ue_workers import ( UEProjectGenerationWorker, UEPluginInstallWorker ) -from openpype.hosts.unreal.ui import SplashScreen +from ayon_core.hosts.unreal.ui import SplashScreen class UnrealPrelaunchHook(PreLaunchHook): diff --git a/client/ayon_core/hosts/unreal/lib.py b/client/ayon_core/hosts/unreal/lib.py index 6d544f65b2..fe9e239ed5 100644 --- a/client/ayon_core/hosts/unreal/lib.py +++ b/client/ayon_core/hosts/unreal/lib.py @@ -11,7 +11,7 @@ from distutils import dir_util from pathlib import Path from typing import List -from openpype.settings import get_project_settings +from ayon_core.settings import get_project_settings def get_engine_versions(env=None): diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_camera.py b/client/ayon_core/hosts/unreal/plugins/create/create_camera.py index 73afb6cefd..f78de00f44 100644 --- a/client/ayon_core/hosts/unreal/plugins/create/create_camera.py +++ b/client/ayon_core/hosts/unreal/plugins/create/create_camera.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- import unreal -from openpype.pipeline import CreatorError -from openpype.hosts.unreal.api.pipeline import UNREAL_VERSION -from openpype.hosts.unreal.api.plugin import ( +from ayon_core.pipeline import CreatorError +from ayon_core.hosts.unreal.api.pipeline import UNREAL_VERSION +from ayon_core.hosts.unreal.api.plugin import ( UnrealAssetCreator, ) diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_layout.py b/client/ayon_core/hosts/unreal/plugins/create/create_layout.py index e5c7b8ee19..0ec8a8d445 100644 --- a/client/ayon_core/hosts/unreal/plugins/create/create_layout.py +++ b/client/ayon_core/hosts/unreal/plugins/create/create_layout.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from openpype.hosts.unreal.api.plugin import ( +from ayon_core.hosts.unreal.api.plugin import ( UnrealActorCreator, ) diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_look.py b/client/ayon_core/hosts/unreal/plugins/create/create_look.py index e15b57b2ee..ecc0783c35 100644 --- a/client/ayon_core/hosts/unreal/plugins/create/create_look.py +++ b/client/ayon_core/hosts/unreal/plugins/create/create_look.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- import unreal -from openpype.pipeline import CreatorError -from openpype.hosts.unreal.api.pipeline import ( +from ayon_core.pipeline import CreatorError +from ayon_core.hosts.unreal.api.pipeline import ( create_folder ) -from openpype.hosts.unreal.api.plugin import ( +from ayon_core.hosts.unreal.api.plugin import ( UnrealAssetCreator ) -from openpype.lib import UILabelDef +from ayon_core.lib import UILabelDef class CreateLook(UnrealAssetCreator): diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_render.py b/client/ayon_core/hosts/unreal/plugins/create/create_render.py index 5f561e68ad..5bb782e7ea 100644 --- a/client/ayon_core/hosts/unreal/plugins/create/create_render.py +++ b/client/ayon_core/hosts/unreal/plugins/create/create_render.py @@ -3,15 +3,15 @@ from pathlib import Path import unreal -from openpype.hosts.unreal.api.pipeline import ( +from ayon_core.hosts.unreal.api.pipeline import ( UNREAL_VERSION, create_folder, get_subsequences, ) -from openpype.hosts.unreal.api.plugin import ( +from ayon_core.hosts.unreal.api.plugin import ( UnrealAssetCreator ) -from openpype.lib import ( +from ayon_core.lib import ( UILabelDef, UISeparatorDef, BoolDef, diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_staticmeshfbx.py b/client/ayon_core/hosts/unreal/plugins/create/create_staticmeshfbx.py index 80816d8386..7fcd6f165a 100644 --- a/client/ayon_core/hosts/unreal/plugins/create/create_staticmeshfbx.py +++ b/client/ayon_core/hosts/unreal/plugins/create/create_staticmeshfbx.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from openpype.hosts.unreal.api.plugin import ( +from ayon_core.hosts.unreal.api.plugin import ( UnrealAssetCreator, ) diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_uasset.py b/client/ayon_core/hosts/unreal/plugins/create/create_uasset.py index f70ecc55b3..500726497d 100644 --- a/client/ayon_core/hosts/unreal/plugins/create/create_uasset.py +++ b/client/ayon_core/hosts/unreal/plugins/create/create_uasset.py @@ -3,8 +3,8 @@ from pathlib import Path import unreal -from openpype.pipeline import CreatorError -from openpype.hosts.unreal.api.plugin import ( +from ayon_core.pipeline import CreatorError +from ayon_core.hosts.unreal.api.plugin import ( UnrealAssetCreator, ) diff --git a/client/ayon_core/hosts/unreal/plugins/inventory/delete_unused_assets.py b/client/ayon_core/hosts/unreal/plugins/inventory/delete_unused_assets.py index 8320e3c92d..cb831583cb 100644 --- a/client/ayon_core/hosts/unreal/plugins/inventory/delete_unused_assets.py +++ b/client/ayon_core/hosts/unreal/plugins/inventory/delete_unused_assets.py @@ -1,8 +1,8 @@ import unreal -from openpype.hosts.unreal.api.tools_ui import qt_app_context -from openpype.hosts.unreal.api.pipeline import delete_asset_if_unused -from openpype.pipeline import InventoryAction +from ayon_core.hosts.unreal.api.tools_ui import qt_app_context +from ayon_core.hosts.unreal.api.pipeline import delete_asset_if_unused +from ayon_core.pipeline import InventoryAction class DeleteUnusedAssets(InventoryAction): @@ -34,8 +34,8 @@ class DeleteUnusedAssets(InventoryAction): def _show_confirmation_dialog(self, containers): from qtpy import QtCore - from openpype.widgets import popup - from openpype.style import load_stylesheet + from ayon_core.widgets import popup + from ayon_core.style import load_stylesheet dialog = popup.Popup() dialog.setWindowFlags( diff --git a/client/ayon_core/hosts/unreal/plugins/inventory/update_actors.py b/client/ayon_core/hosts/unreal/plugins/inventory/update_actors.py index b0d941ba80..96965d68e6 100644 --- a/client/ayon_core/hosts/unreal/plugins/inventory/update_actors.py +++ b/client/ayon_core/hosts/unreal/plugins/inventory/update_actors.py @@ -1,12 +1,12 @@ import unreal -from openpype.hosts.unreal.api.pipeline import ( +from ayon_core.hosts.unreal.api.pipeline import ( ls, replace_static_mesh_actors, replace_skeletal_mesh_actors, replace_geometry_cache_actors, ) -from openpype.pipeline import InventoryAction +from ayon_core.pipeline import InventoryAction def update_assets(containers, selected): diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_alembic_animation.py b/client/ayon_core/hosts/unreal/plugins/load/load_alembic_animation.py index 0328d2ae9f..4d7760e385 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_alembic_animation.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_alembic_animation.py @@ -2,12 +2,12 @@ """Load Alembic Animation.""" import os -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api import pipeline as unreal_pipeline +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api import pipeline as unreal_pipeline import unreal # noqa diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_animation.py b/client/ayon_core/hosts/unreal/plugins/load/load_animation.py index 7ed85ee411..4d44b6c0c2 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_animation.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_animation.py @@ -8,13 +8,13 @@ from unreal import EditorAssetLibrary from unreal import MovieSceneSkeletalAnimationTrack from unreal import MovieSceneSkeletalAnimationSection -from openpype.pipeline.context_tools import get_current_project_asset -from openpype.pipeline import ( +from ayon_core.pipeline.context_tools import get_current_project_asset +from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api import pipeline as unreal_pipeline +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api import pipeline as unreal_pipeline class AnimationFBXLoader(plugin.Loader): diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_camera.py b/client/ayon_core/hosts/unreal/plugins/load/load_camera.py index d663ce20ea..faba561085 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_camera.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_camera.py @@ -9,13 +9,13 @@ from unreal import ( EditorLevelUtils, LevelSequenceEditorBlueprintLibrary as LevelSequenceLib, ) -from openpype.client import get_asset_by_name -from openpype.pipeline import ( +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline import ( AYON_CONTAINER_ID, get_current_project_name, ) -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api.pipeline import ( +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api.pipeline import ( generate_sequence, set_sequence_hierarchy, create_container, diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_geometrycache_abc.py b/client/ayon_core/hosts/unreal/plugins/load/load_geometrycache_abc.py index ec9c52b9fb..360737cbc5 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_geometrycache_abc.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_geometrycache_abc.py @@ -2,12 +2,12 @@ """Loader for published alembics.""" import os -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api.pipeline import ( +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api.pipeline import ( AYON_ASSET_DIR, create_container, imprint, diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_layout.py b/client/ayon_core/hosts/unreal/plugins/load/load_layout.py index 3b82da5068..a1cc2e785a 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_layout.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_layout.py @@ -16,8 +16,8 @@ from unreal import ( LevelSequenceEditorBlueprintLibrary as LevelSequenceLib, ) -from openpype.client import get_asset_by_name, get_representations -from openpype.pipeline import ( +from ayon_core.client import get_asset_by_name, get_representations +from ayon_core.pipeline import ( discover_loader_plugins, loaders_from_representation, load_container, @@ -25,10 +25,10 @@ from openpype.pipeline import ( AYON_CONTAINER_ID, get_current_project_name, ) -from openpype.pipeline.context_tools import get_current_project_asset -from openpype.settings import get_current_project_settings -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api.pipeline import ( +from ayon_core.pipeline.context_tools import get_current_project_asset +from ayon_core.settings import get_current_project_settings +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api.pipeline import ( generate_sequence, set_sequence_hierarchy, create_container, diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_layout_existing.py b/client/ayon_core/hosts/unreal/plugins/load/load_layout_existing.py index c53e92930a..6f390b4920 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_layout_existing.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_layout_existing.py @@ -4,8 +4,8 @@ from pathlib import Path import unreal from unreal import EditorLevelLibrary -from openpype.client import get_representations -from openpype.pipeline import ( +from ayon_core.client import get_representations +from ayon_core.pipeline import ( discover_loader_plugins, loaders_from_representation, load_container, @@ -13,8 +13,8 @@ from openpype.pipeline import ( AYON_CONTAINER_ID, get_current_project_name, ) -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api import pipeline as upipeline +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api import pipeline as upipeline class ExistingLayoutLoader(plugin.Loader): diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_abc.py b/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_abc.py index 8ebd9a82b6..225df3b440 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_abc.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_abc.py @@ -2,12 +2,12 @@ """Load Skeletal Mesh alembics.""" import os -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api.pipeline import ( +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api.pipeline import ( AYON_ASSET_DIR, create_container, imprint, diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_fbx.py b/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_fbx.py index a5a8730732..1c45c58d02 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_fbx.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_fbx.py @@ -2,12 +2,12 @@ """Load Skeletal Meshes form FBX.""" import os -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api.pipeline import ( +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api.pipeline import ( AYON_ASSET_DIR, create_container, imprint, diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_abc.py b/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_abc.py index 019a95a9bf..a0814b5b07 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_abc.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_abc.py @@ -2,12 +2,12 @@ """Loader for Static Mesh alembics.""" import os -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api.pipeline import ( +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api.pipeline import ( AYON_ASSET_DIR, create_container, imprint, diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_fbx.py b/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_fbx.py index 66088d793c..a78b1bc959 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_fbx.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_fbx.py @@ -2,12 +2,12 @@ """Load Static meshes form FBX.""" import os -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api.pipeline import ( +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api.pipeline import ( AYON_ASSET_DIR, create_container, imprint, diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_uasset.py b/client/ayon_core/hosts/unreal/plugins/load/load_uasset.py index dfd92d2fe5..048ec8eaba 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_uasset.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_uasset.py @@ -3,12 +3,12 @@ from pathlib import Path import shutil -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api import pipeline as unreal_pipeline +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api import pipeline as unreal_pipeline import unreal # noqa diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_yeticache.py b/client/ayon_core/hosts/unreal/plugins/load/load_yeticache.py index 780ed7c484..b643f352b7 100644 --- a/client/ayon_core/hosts/unreal/plugins/load/load_yeticache.py +++ b/client/ayon_core/hosts/unreal/plugins/load/load_yeticache.py @@ -3,12 +3,12 @@ import os import json -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from openpype.hosts.unreal.api import plugin -from openpype.hosts.unreal.api import pipeline as unreal_pipeline +from ayon_core.hosts.unreal.api import plugin +from ayon_core.hosts.unreal.api import pipeline as unreal_pipeline import unreal # noqa diff --git a/client/ayon_core/hosts/unreal/plugins/publish/collect_render_instances.py b/client/ayon_core/hosts/unreal/plugins/publish/collect_render_instances.py index dad0310dfc..8641094610 100644 --- a/client/ayon_core/hosts/unreal/plugins/publish/collect_render_instances.py +++ b/client/ayon_core/hosts/unreal/plugins/publish/collect_render_instances.py @@ -3,9 +3,9 @@ from pathlib import Path import unreal -from openpype.pipeline import get_current_project_name -from openpype.pipeline import Anatomy -from openpype.hosts.unreal.api import pipeline +from ayon_core.pipeline import get_current_project_name +from ayon_core.pipeline import Anatomy +from ayon_core.hosts.unreal.api import pipeline import pyblish.api diff --git a/client/ayon_core/hosts/unreal/plugins/publish/extract_camera.py b/client/ayon_core/hosts/unreal/plugins/publish/extract_camera.py index 16e365ca96..ebc5452011 100644 --- a/client/ayon_core/hosts/unreal/plugins/publish/extract_camera.py +++ b/client/ayon_core/hosts/unreal/plugins/publish/extract_camera.py @@ -4,8 +4,8 @@ import os import unreal -from openpype.pipeline import publish -from openpype.hosts.unreal.api.pipeline import UNREAL_VERSION +from ayon_core.pipeline import publish +from ayon_core.hosts.unreal.api.pipeline import UNREAL_VERSION class ExtractCamera(publish.Extractor): diff --git a/client/ayon_core/hosts/unreal/plugins/publish/extract_layout.py b/client/ayon_core/hosts/unreal/plugins/publish/extract_layout.py index d30d04551d..a508f79f18 100644 --- a/client/ayon_core/hosts/unreal/plugins/publish/extract_layout.py +++ b/client/ayon_core/hosts/unreal/plugins/publish/extract_layout.py @@ -7,8 +7,8 @@ import unreal from unreal import EditorLevelLibrary as ell from unreal import EditorAssetLibrary as eal -from openpype.client import get_representation_by_name -from openpype.pipeline import publish +from ayon_core.client import get_representation_by_name +from ayon_core.pipeline import publish class ExtractLayout(publish.Extractor): diff --git a/client/ayon_core/hosts/unreal/plugins/publish/extract_look.py b/client/ayon_core/hosts/unreal/plugins/publish/extract_look.py index 4b32b4eb95..fd1277e302 100644 --- a/client/ayon_core/hosts/unreal/plugins/publish/extract_look.py +++ b/client/ayon_core/hosts/unreal/plugins/publish/extract_look.py @@ -5,7 +5,7 @@ import os import unreal from unreal import MaterialEditingLibrary as mat_lib -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractLook(publish.Extractor): diff --git a/client/ayon_core/hosts/unreal/plugins/publish/extract_uasset.py b/client/ayon_core/hosts/unreal/plugins/publish/extract_uasset.py index 0dd7ff4a0d..fa4fb4c04a 100644 --- a/client/ayon_core/hosts/unreal/plugins/publish/extract_uasset.py +++ b/client/ayon_core/hosts/unreal/plugins/publish/extract_uasset.py @@ -3,7 +3,7 @@ import shutil import unreal -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractUAsset(publish.Extractor): diff --git a/client/ayon_core/hosts/unreal/plugins/publish/validate_sequence_frames.py b/client/ayon_core/hosts/unreal/plugins/publish/validate_sequence_frames.py index 06acbf0992..205436ad37 100644 --- a/client/ayon_core/hosts/unreal/plugins/publish/validate_sequence_frames.py +++ b/client/ayon_core/hosts/unreal/plugins/publish/validate_sequence_frames.py @@ -3,7 +3,7 @@ import os import re import pyblish.api -from openpype.pipeline.publish import PublishValidationError +from ayon_core.pipeline.publish import PublishValidationError class ValidateSequenceFrames(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/unreal/ue_workers.py b/client/ayon_core/hosts/unreal/ue_workers.py index 386ad877d7..e3f8729c2e 100644 --- a/client/ayon_core/hosts/unreal/ue_workers.py +++ b/client/ayon_core/hosts/unreal/ue_workers.py @@ -11,8 +11,8 @@ from typing import List, Union from qtpy import QtCore -import openpype.hosts.unreal.lib as ue_lib -from openpype.settings import get_project_settings +import ayon_core.hosts.unreal.lib as ue_lib +from ayon_core.settings import get_project_settings def parse_comp_progress(line: str, progress_signal: QtCore.Signal(int)): diff --git a/client/ayon_core/hosts/unreal/ui/splash_screen.py b/client/ayon_core/hosts/unreal/ui/splash_screen.py index 7ac77821d9..f136fe34fe 100644 --- a/client/ayon_core/hosts/unreal/ui/splash_screen.py +++ b/client/ayon_core/hosts/unreal/ui/splash_screen.py @@ -1,5 +1,5 @@ from qtpy import QtWidgets, QtCore, QtGui -from openpype import style, resources +from ayon_core import style, resources class SplashScreen(QtWidgets.QDialog): diff --git a/client/ayon_core/hosts/webpublisher/addon.py b/client/ayon_core/hosts/webpublisher/addon.py index 810d9aa6c3..33126409bb 100644 --- a/client/ayon_core/hosts/webpublisher/addon.py +++ b/client/ayon_core/hosts/webpublisher/addon.py @@ -1,6 +1,6 @@ import os -from openpype.modules import click_wrap, OpenPypeModule, IHostAddon +from ayon_core.modules import click_wrap, OpenPypeModule, IHostAddon WEBPUBLISHER_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/hosts/webpublisher/api/__init__.py b/client/ayon_core/hosts/webpublisher/api/__init__.py index afea838e2c..85987ab17a 100644 --- a/client/ayon_core/hosts/webpublisher/api/__init__.py +++ b/client/ayon_core/hosts/webpublisher/api/__init__.py @@ -3,8 +3,8 @@ import logging import pyblish.api -from openpype.host import HostBase -from openpype.hosts.webpublisher import WEBPUBLISHER_ROOT_DIR +from ayon_core.host import HostBase +from ayon_core.hosts.webpublisher import WEBPUBLISHER_ROOT_DIR log = logging.getLogger("openpype.hosts.webpublisher") diff --git a/client/ayon_core/hosts/webpublisher/lib.py b/client/ayon_core/hosts/webpublisher/lib.py index ecd28d2432..ffa2f25ee9 100644 --- a/client/ayon_core/hosts/webpublisher/lib.py +++ b/client/ayon_core/hosts/webpublisher/lib.py @@ -8,10 +8,10 @@ from bson.objectid import ObjectId import pyblish.util import pyblish.api -from openpype.client.mongo import OpenPypeMongoConnection -from openpype.settings import get_project_settings -from openpype.lib import Logger -from openpype.lib.profiles_filtering import filter_profiles +from ayon_core.client.mongo import OpenPypeMongoConnection +from ayon_core.settings import get_project_settings +from ayon_core.lib import Logger +from ayon_core.lib.profiles_filtering import filter_profiles ERROR_STATUS = "error" IN_PROGRESS_STATUS = "in_progress" diff --git a/client/ayon_core/hosts/webpublisher/plugins/publish/collect_batch_data.py b/client/ayon_core/hosts/webpublisher/plugins/publish/collect_batch_data.py index eb2737b276..e4823560b2 100644 --- a/client/ayon_core/hosts/webpublisher/plugins/publish/collect_batch_data.py +++ b/client/ayon_core/hosts/webpublisher/plugins/publish/collect_batch_data.py @@ -13,7 +13,7 @@ import os import pyblish.api -from openpype.pipeline import legacy_io +from ayon_core.pipeline import legacy_io from openpype_modules.webpublisher.lib import ( parse_json, get_batch_asset_task_info, diff --git a/client/ayon_core/hosts/webpublisher/plugins/publish/collect_published_files.py b/client/ayon_core/hosts/webpublisher/plugins/publish/collect_published_files.py index 6bb67ef260..bd1cdb11f5 100644 --- a/client/ayon_core/hosts/webpublisher/plugins/publish/collect_published_files.py +++ b/client/ayon_core/hosts/webpublisher/plugins/publish/collect_published_files.py @@ -14,18 +14,18 @@ import math import pyblish.api -from openpype.client import ( +from ayon_core.client import ( get_asset_by_name, get_last_version_by_subset_name ) -from openpype.lib import ( +from ayon_core.lib import ( prepare_template_data, get_ffprobe_streams, convert_ffprobe_fps_value, ) -from openpype.pipeline.create import get_subset_name +from ayon_core.pipeline.create import get_subset_name from openpype_modules.webpublisher.lib import parse_json -from openpype.pipeline.version_start import get_versioning_start +from ayon_core.pipeline.version_start import get_versioning_start class CollectPublishedFiles(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/webpublisher/plugins/publish/collect_tvpaint_instances.py b/client/ayon_core/hosts/webpublisher/plugins/publish/collect_tvpaint_instances.py index 948e86c23e..33e4662832 100644 --- a/client/ayon_core/hosts/webpublisher/plugins/publish/collect_tvpaint_instances.py +++ b/client/ayon_core/hosts/webpublisher/plugins/publish/collect_tvpaint_instances.py @@ -10,7 +10,7 @@ import re import copy import pyblish.api -from openpype.pipeline.create import get_subset_name +from ayon_core.pipeline.create import get_subset_name class CollectTVPaintInstances(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/webpublisher/plugins/publish/collect_tvpaint_workfile_data.py b/client/ayon_core/hosts/webpublisher/plugins/publish/collect_tvpaint_workfile_data.py index b5f8ed9c8f..5ceb6157d2 100644 --- a/client/ayon_core/hosts/webpublisher/plugins/publish/collect_tvpaint_workfile_data.py +++ b/client/ayon_core/hosts/webpublisher/plugins/publish/collect_tvpaint_workfile_data.py @@ -16,7 +16,7 @@ import uuid import json import shutil import pyblish.api -from openpype.hosts.tvpaint.worker import ( +from ayon_core.hosts.tvpaint.worker import ( SenderTVPaintCommands, CollectSceneData ) diff --git a/client/ayon_core/hosts/webpublisher/plugins/publish/extract_tvpaint_workfile.py b/client/ayon_core/hosts/webpublisher/plugins/publish/extract_tvpaint_workfile.py index 2142d740a5..d1714154e9 100644 --- a/client/ayon_core/hosts/webpublisher/plugins/publish/extract_tvpaint_workfile.py +++ b/client/ayon_core/hosts/webpublisher/plugins/publish/extract_tvpaint_workfile.py @@ -1,14 +1,14 @@ import os import copy -from openpype.hosts.tvpaint.worker import ( +from ayon_core.hosts.tvpaint.worker import ( SenderTVPaintCommands, ExecuteSimpleGeorgeScript, ExecuteGeorgeScript ) import pyblish.api -from openpype.hosts.tvpaint.lib import ( +from ayon_core.hosts.tvpaint.lib import ( calculate_layers_extraction_data, get_frame_filename_template, fill_reference_frames, diff --git a/client/ayon_core/hosts/webpublisher/publish_functions.py b/client/ayon_core/hosts/webpublisher/publish_functions.py index f5dc88f54d..ae1d2e61ba 100644 --- a/client/ayon_core/hosts/webpublisher/publish_functions.py +++ b/client/ayon_core/hosts/webpublisher/publish_functions.py @@ -3,13 +3,13 @@ import time import pyblish.api import pyblish.util -from openpype.lib import Logger -from openpype.lib.applications import ( +from ayon_core.lib import Logger +from ayon_core.lib.applications import ( ApplicationManager, LaunchTypes, ) -from openpype.pipeline import install_host -from openpype.hosts.webpublisher.api import WebpublisherHost +from ayon_core.pipeline import install_host +from ayon_core.hosts.webpublisher.api import WebpublisherHost from .lib import ( get_batch_asset_task_info, diff --git a/client/ayon_core/hosts/webpublisher/webserver_service/webpublish_routes.py b/client/ayon_core/hosts/webpublisher/webserver_service/webpublish_routes.py index 20d585e906..5490bbe4b0 100644 --- a/client/ayon_core/hosts/webpublisher/webserver_service/webpublish_routes.py +++ b/client/ayon_core/hosts/webpublisher/webserver_service/webpublish_routes.py @@ -7,12 +7,12 @@ import subprocess from bson.objectid import ObjectId from aiohttp.web_response import Response -from openpype.client import ( +from ayon_core.client import ( get_projects, get_assets, ) -from openpype.lib import Logger -from openpype.settings import get_project_settings +from ayon_core.lib import Logger +from ayon_core.settings import get_project_settings from openpype_modules.webserver.base_routes import RestApiEndpoint from openpype_modules.webpublisher import WebpublisherAddon from openpype_modules.webpublisher.lib import ( diff --git a/client/ayon_core/hosts/webpublisher/webserver_service/webserver.py b/client/ayon_core/hosts/webpublisher/webserver_service/webserver.py index d7c2ea01b9..0c21eb4380 100644 --- a/client/ayon_core/hosts/webpublisher/webserver_service/webserver.py +++ b/client/ayon_core/hosts/webpublisher/webserver_service/webserver.py @@ -6,9 +6,9 @@ import requests import json import subprocess -from openpype.client import OpenPypeMongoConnection -from openpype.modules import ModulesManager -from openpype.lib import Logger +from ayon_core.client import OpenPypeMongoConnection +from ayon_core.modules import ModulesManager +from ayon_core.lib import Logger from openpype_modules.webpublisher.lib import ( ERROR_STATUS, diff --git a/client/ayon_core/lib/__init__.py b/client/ayon_core/lib/__init__.py index b3b12ac250..be010c5a8c 100644 --- a/client/ayon_core/lib/__init__.py +++ b/client/ayon_core/lib/__init__.py @@ -5,11 +5,11 @@ import sys import os import site -from openpype import PACKAGE_DIR +from ayon_core import AYON_CORE_ROOT # Add Python version specific vendor folder python_version_dir = os.path.join( - PACKAGE_DIR, "vendor", "python", "python_{}".format(sys.version[0]) + AYON_CORE_ROOT, "vendor", "python", "python_{}".format(sys.version[0]) ) # Prepend path in sys paths sys.path.insert(0, python_version_dir) diff --git a/client/ayon_core/lib/applications.py b/client/ayon_core/lib/applications.py index 4d75a01e1d..e15ea151ba 100644 --- a/client/ayon_core/lib/applications.py +++ b/client/ayon_core/lib/applications.py @@ -11,14 +11,14 @@ from abc import ABCMeta, abstractmethod import six -from openpype import AYON_SERVER_ENABLED, PACKAGE_DIR -from openpype.client import get_asset_name_identifier -from openpype.settings import ( +from ayon_core import AYON_SERVER_ENABLED, AYON_CORE_ROOT +from ayon_core.client import get_asset_name_identifier +from ayon_core.settings import ( get_system_settings, get_project_settings, get_local_settings ) -from openpype.settings.constants import ( +from ayon_core.settings.constants import ( METADATA_KEYS, M_DYNAMIC_KEY_LABEL ) @@ -950,7 +950,7 @@ class ApplicationLaunchContext: launch_type=None, **data ): - from openpype.modules import ModulesManager + from ayon_core.modules import ModulesManager # Application object self.application = application @@ -1105,10 +1105,7 @@ class ApplicationLaunchContext: paths = [] # TODO load additional studio paths from settings - import openpype - openpype_dir = os.path.dirname(os.path.abspath(openpype.__file__)) - - global_hooks_dir = os.path.join(openpype_dir, "hooks") + global_hooks_dir = os.path.join(AYON_CORE_ROOT, "hooks") hooks_dirs = [ global_hooks_dir @@ -1120,7 +1117,7 @@ class ApplicationLaunchContext: host_module = self.modules_manager.get_host_module(self.host_name) if not host_module: hooks_dirs.append(os.path.join( - openpype_dir, "hosts", self.host_name, "hooks" + AYON_CORE_ROOT, "hosts", self.host_name, "hooks" )) for path in hooks_dirs: @@ -1507,7 +1504,7 @@ def _add_python_version_paths(app, env, logger, modules_manager): # Add Python 2/3 modules python_vendor_dir = os.path.join( - PACKAGE_DIR, + AYON_CORE_ROOT, "vendor", "python" ) @@ -1547,7 +1544,7 @@ def prepare_app_environments( source_env = data["env"].copy() if modules_manager is None: - from openpype.modules import ModulesManager + from ayon_core.modules import ModulesManager modules_manager = ModulesManager() @@ -1701,7 +1698,7 @@ def prepare_context_environments(data, env_group=None, modules_manager=None): result will be stored. """ - from openpype.pipeline.template_data import get_template_data + from ayon_core.pipeline.template_data import get_template_data # Context environments log = data["log"] @@ -1772,7 +1769,7 @@ def prepare_context_environments(data, env_group=None, modules_manager=None): data["task_type"] = task_type try: - from openpype.pipeline.workfile import get_workdir_with_workdir_data + from ayon_core.pipeline.workfile import get_workdir_with_workdir_data workdir = get_workdir_with_workdir_data( workdir_data, @@ -1818,8 +1815,8 @@ def _prepare_last_workfile(data, workdir, modules_manager): workdir (str): Path to folder where workfiles should be stored. """ - from openpype.modules import ModulesManager - from openpype.pipeline import HOST_WORKFILE_EXTENSIONS + from ayon_core.modules import ModulesManager + from ayon_core.pipeline import HOST_WORKFILE_EXTENSIONS if not modules_manager: modules_manager = ModulesManager() @@ -1878,7 +1875,7 @@ def _prepare_last_workfile(data, workdir, modules_manager): extensions = HOST_WORKFILE_EXTENSIONS.get(app.host_name) if extensions: - from openpype.pipeline.workfile import ( + from ayon_core.pipeline.workfile import ( get_workfile_template_key, get_last_workfile ) diff --git a/client/ayon_core/lib/execute.py b/client/ayon_core/lib/execute.py index c54541a116..eb86cbd57d 100644 --- a/client/ayon_core/lib/execute.py +++ b/client/ayon_core/lib/execute.py @@ -5,7 +5,7 @@ import platform import json import tempfile -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED from .log import Logger from .vendor_bin_utils import find_executable diff --git a/client/ayon_core/lib/file_transaction.py b/client/ayon_core/lib/file_transaction.py index 80f4e81f2c..81a3b386f6 100644 --- a/client/ayon_core/lib/file_transaction.py +++ b/client/ayon_core/lib/file_transaction.py @@ -4,7 +4,7 @@ import sys import errno import six -from openpype.lib import create_hard_link +from ayon_core.lib import create_hard_link # this is needed until speedcopy for linux is fixed if sys.platform == "win32": diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py index ea42d2f0b5..7f1c66330a 100644 --- a/client/ayon_core/lib/local_settings.py +++ b/client/ayon_core/lib/local_settings.py @@ -29,14 +29,14 @@ except ImportError: import six import appdirs -from openpype import AYON_SERVER_ENABLED -from openpype.settings import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.settings import ( get_local_settings, get_system_settings ) -from openpype.client.mongo import validate_mongo_connection -from openpype.client import get_ayon_server_api_connection +from ayon_core.client.mongo import validate_mongo_connection +from ayon_core.client import get_ayon_server_api_connection _PLACEHOLDER = object() diff --git a/client/ayon_core/lib/log.py b/client/ayon_core/lib/log.py index 72071063ec..8156641787 100644 --- a/client/ayon_core/lib/log.py +++ b/client/ayon_core/lib/log.py @@ -24,8 +24,8 @@ import traceback import threading import copy -from openpype import AYON_SERVER_ENABLED -from openpype.client.mongo import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client.mongo import ( MongoEnvNotSet, get_default_components, OpenPypeMongoConnection, diff --git a/client/ayon_core/lib/openpype_version.py b/client/ayon_core/lib/openpype_version.py index 5618eb0c2e..83b4b6f79b 100644 --- a/client/ayon_core/lib/openpype_version.py +++ b/client/ayon_core/lib/openpype_version.py @@ -12,8 +12,8 @@ repository or locally available. import os import sys -import openpype.version -from openpype import AYON_SERVER_ENABLED +import ayon_core.version +from ayon_core import AYON_SERVER_ENABLED from .python_module_tools import import_filepath @@ -121,7 +121,7 @@ def is_running_staging(): if not op_version_control_available(): return False - from openpype.settings import get_global_settings + from ayon_core.settings import get_global_settings global_settings = get_global_settings() production_version = global_settings["production_version"] diff --git a/client/ayon_core/lib/project_backpack.py b/client/ayon_core/lib/project_backpack.py index 91a5b76e35..b5bdcb188d 100644 --- a/client/ayon_core/lib/project_backpack.py +++ b/client/ayon_core/lib/project_backpack.py @@ -22,7 +22,7 @@ import shutil import datetime import zipfile -from openpype.client.mongo import ( +from ayon_core.client.mongo import ( load_json_file, get_project_connection, replace_project_documents, diff --git a/client/ayon_core/lib/pype_info.py b/client/ayon_core/lib/pype_info.py index 2f57d76850..3615c1e34a 100644 --- a/client/ayon_core/lib/pype_info.py +++ b/client/ayon_core/lib/pype_info.py @@ -5,8 +5,8 @@ import platform import getpass import socket -from openpype import AYON_SERVER_ENABLED -from openpype.settings.lib import get_local_settings +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.settings.lib import get_local_settings from .execute import get_openpype_execute_args from .local_settings import get_local_site_id from .openpype_version import ( diff --git a/client/ayon_core/lib/terminal.py b/client/ayon_core/lib/terminal.py index f6072ed209..29537234e8 100644 --- a/client/ayon_core/lib/terminal.py +++ b/client/ayon_core/lib/terminal.py @@ -48,7 +48,7 @@ class Terminal: Set `_initialized` attribute to `True` when is done. """ - from openpype.lib import env_value_to_bool + from ayon_core.lib import env_value_to_bool log_no_colors = env_value_to_bool( "OPENPYPE_LOG_NO_COLORS", default=None ) diff --git a/client/ayon_core/lib/usdlib.py b/client/ayon_core/lib/usdlib.py index c166feb3a6..2a5a317d72 100644 --- a/client/ayon_core/lib/usdlib.py +++ b/client/ayon_core/lib/usdlib.py @@ -8,8 +8,8 @@ except ImportError: # Allow to fall back on Multiverse 6.3.0+ pxr usd library from mvpxr import Usd, UsdGeom, Sdf, Kind -from openpype.client import get_project, get_asset_by_name -from openpype.pipeline import Anatomy, get_current_project_name +from ayon_core.client import get_project, get_asset_by_name +from ayon_core.pipeline import Anatomy, get_current_project_name log = logging.getLogger(__name__) diff --git a/client/ayon_core/lib/vendor_bin_utils.py b/client/ayon_core/lib/vendor_bin_utils.py index dc8bb7435e..f8272d5d49 100644 --- a/client/ayon_core/lib/vendor_bin_utils.py +++ b/client/ayon_core/lib/vendor_bin_utils.py @@ -3,7 +3,7 @@ import logging import platform import subprocess -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED log = logging.getLogger("Vendor utils") diff --git a/client/ayon_core/modules/avalon_apps/avalon_app.py b/client/ayon_core/modules/avalon_apps/avalon_app.py index 57754793c4..efae0c8a9f 100644 --- a/client/ayon_core/modules/avalon_apps/avalon_app.py +++ b/client/ayon_core/modules/avalon_apps/avalon_app.py @@ -1,7 +1,7 @@ import os -from openpype import AYON_SERVER_ENABLED -from openpype.modules import OpenPypeModule, ITrayModule +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.modules import OpenPypeModule, ITrayModule class AvalonModule(OpenPypeModule, ITrayModule): @@ -44,7 +44,7 @@ class AvalonModule(OpenPypeModule, ITrayModule): # Add library tool self._library_loader_imported = False try: - from openpype.tools.libraryloader import LibraryLoaderWindow + from ayon_core.tools.libraryloader import LibraryLoaderWindow self._library_loader_imported = True except Exception: @@ -76,7 +76,7 @@ class AvalonModule(OpenPypeModule, ITrayModule): def show_library_loader(self): if self._library_loader_window is None: - from openpype.pipeline import install_openpype_plugins + from ayon_core.pipeline import install_openpype_plugins if AYON_SERVER_ENABLED: self._init_ayon_loader() else: @@ -101,7 +101,7 @@ class AvalonModule(OpenPypeModule, ITrayModule): def _init_library_loader(self): from qtpy import QtCore - from openpype.tools.libraryloader import LibraryLoaderWindow + from ayon_core.tools.libraryloader import LibraryLoaderWindow libraryloader = LibraryLoaderWindow( show_projects=True, @@ -115,7 +115,7 @@ class AvalonModule(OpenPypeModule, ITrayModule): self._library_loader_window = libraryloader def _init_ayon_loader(self): - from openpype.tools.ayon_loader.ui import LoaderWindow + from ayon_core.tools.ayon_loader.ui import LoaderWindow libraryloader = LoaderWindow() diff --git a/client/ayon_core/modules/avalon_apps/rest_api.py b/client/ayon_core/modules/avalon_apps/rest_api.py index a52ce1b6df..9435f51d80 100644 --- a/client/ayon_core/modules/avalon_apps/rest_api.py +++ b/client/ayon_core/modules/avalon_apps/rest_api.py @@ -5,7 +5,7 @@ from bson.objectid import ObjectId from aiohttp.web_response import Response -from openpype.client import ( +from ayon_core.client import ( get_projects, get_project, get_assets, diff --git a/client/ayon_core/modules/base.py b/client/ayon_core/modules/base.py index cb64816cc9..5907254d49 100644 --- a/client/ayon_core/modules/base.py +++ b/client/ayon_core/modules/base.py @@ -18,9 +18,9 @@ from abc import ABCMeta, abstractmethod import six import appdirs -from openpype import AYON_SERVER_ENABLED -from openpype.client import get_ayon_server_api_connection -from openpype.settings import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import get_ayon_server_api_connection +from ayon_core.settings import ( get_system_settings, SYSTEM_SETTINGS_KEY, PROJECT_SETTINGS_KEY, @@ -28,16 +28,16 @@ from openpype.settings import ( SCHEMA_KEY_PROJECT_SETTINGS ) -from openpype.settings.lib import ( +from ayon_core.settings.lib import ( get_studio_system_settings_overrides, load_json_file, ) -from openpype.settings.ayon_settings import ( +from ayon_core.settings.ayon_settings import ( is_dev_mode_enabled, get_ayon_settings, ) -from openpype.lib import ( +from ayon_core.lib import ( Logger, import_filepath, import_module_from_dirpath, diff --git a/client/ayon_core/modules/click_wrap.py b/client/ayon_core/modules/click_wrap.py index ed67035ec8..ffb9c61fa1 100644 --- a/client/ayon_core/modules/click_wrap.py +++ b/client/ayon_core/modules/click_wrap.py @@ -15,7 +15,7 @@ method to convert 'click_wrap' object to 'click' object. Before ```python import click -from openpype.modules import OpenPypeModule +from ayon_core.modules import OpenPypeModule class ExampleAddon(OpenPypeModule): @@ -39,8 +39,8 @@ def mycommand(arg1, arg2): Now ``` -from openpype import click_wrap -from openpype.modules import OpenPypeModule +from ayon_core import click_wrap +from ayon_core.modules import OpenPypeModule class ExampleAddon(OpenPypeModule): @@ -71,8 +71,8 @@ Added small enhancements: Example: ```python - from openpype import click_wrap - from openpype.modules import OpenPypeModule + from ayon_core import click_wrap + from ayon_core.modules import OpenPypeModule class ExampleAddon(OpenPypeModule): diff --git a/client/ayon_core/modules/clockify/clockify_api.py b/client/ayon_core/modules/clockify/clockify_api.py index 47af002f7a..24ac67465f 100644 --- a/client/ayon_core/modules/clockify/clockify_api.py +++ b/client/ayon_core/modules/clockify/clockify_api.py @@ -9,8 +9,8 @@ from .constants import ( ADMIN_PERMISSION_NAMES, ) -from openpype.lib.local_settings import OpenPypeSecureRegistry -from openpype.lib import Logger +from ayon_core.lib.local_settings import OpenPypeSecureRegistry +from ayon_core.lib import Logger class ClockifyAPI: diff --git a/client/ayon_core/modules/clockify/clockify_module.py b/client/ayon_core/modules/clockify/clockify_module.py index b6efec7907..adb7eb66af 100644 --- a/client/ayon_core/modules/clockify/clockify_module.py +++ b/client/ayon_core/modules/clockify/clockify_module.py @@ -2,8 +2,8 @@ import os import threading import time -from openpype.modules import OpenPypeModule, ITrayModule, IPluginPaths -from openpype.client import get_asset_by_name +from ayon_core.modules import OpenPypeModule, ITrayModule, IPluginPaths +from ayon_core.client import get_asset_by_name from .constants import CLOCKIFY_FTRACK_USER_PATH, CLOCKIFY_FTRACK_SERVER_PATH diff --git a/client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py b/client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py index 4a653c1b8d..19aa2ef195 100644 --- a/client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py +++ b/client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py @@ -1,5 +1,5 @@ -from openpype.client import get_asset_by_name -from openpype.pipeline import LauncherAction +from ayon_core.client import get_asset_by_name +from ayon_core.pipeline import LauncherAction from openpype_modules.clockify.clockify_api import ClockifyAPI diff --git a/client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py b/client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py index cbd2519a04..30f5ae698f 100644 --- a/client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py +++ b/client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py @@ -1,6 +1,6 @@ -from openpype.client import get_projects, get_project +from ayon_core.client import get_projects, get_project from openpype_modules.clockify.clockify_api import ClockifyAPI -from openpype.pipeline import LauncherAction +from ayon_core.pipeline import LauncherAction class ClockifyPermissionsCheckFailed(Exception): diff --git a/client/ayon_core/modules/clockify/widgets.py b/client/ayon_core/modules/clockify/widgets.py index 86e67569f2..3c4cc8464a 100644 --- a/client/ayon_core/modules/clockify/widgets.py +++ b/client/ayon_core/modules/clockify/widgets.py @@ -1,5 +1,5 @@ from qtpy import QtCore, QtGui, QtWidgets -from openpype import resources, style +from ayon_core import resources, style class MessageWidget(QtWidgets.QWidget): diff --git a/client/ayon_core/modules/deadline/abstract_submit_deadline.py b/client/ayon_core/modules/deadline/abstract_submit_deadline.py index b0d5d7f222..e49a1a965d 100644 --- a/client/ayon_core/modules/deadline/abstract_submit_deadline.py +++ b/client/ayon_core/modules/deadline/abstract_submit_deadline.py @@ -17,15 +17,15 @@ import attr import requests import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( AbstractMetaInstancePlugin, KnownPublishError, OpenPypePyblishPluginMixin ) -from openpype.pipeline.publish.lib import ( +from ayon_core.pipeline.publish.lib import ( replace_with_published_scene_path ) -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED JSONDecodeError = getattr(json.decoder, "JSONDecodeError", ValueError) diff --git a/client/ayon_core/modules/deadline/deadline_module.py b/client/ayon_core/modules/deadline/deadline_module.py index 9855f8c1b1..c98d04759e 100644 --- a/client/ayon_core/modules/deadline/deadline_module.py +++ b/client/ayon_core/modules/deadline/deadline_module.py @@ -3,8 +3,8 @@ import requests import six import sys -from openpype.lib import requests_get, Logger -from openpype.modules import OpenPypeModule, IPluginPaths +from ayon_core.lib import requests_get, Logger +from ayon_core.modules import OpenPypeModule, IPluginPaths class DeadlineWebserviceError(Exception): diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py index 1d3dad769f..0cfe7c9b39 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py +++ b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py @@ -6,7 +6,7 @@ attribute or using default server if that attribute doesn't exists. """ import pyblish.api -from openpype.pipeline.publish import KnownPublishError +from ayon_core.pipeline.publish import KnownPublishError class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py index cd4cde2519..73b204676c 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py +++ b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py @@ -2,7 +2,7 @@ """Collect default Deadline server.""" import pyblish.api -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py b/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py index 9ee079b892..bd48695422 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py +++ b/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import pyblish.api -from openpype.lib import TextDef -from openpype.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.lib import TextDef +from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin class CollectDeadlinePools(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_publishable_instances.py b/client/ayon_core/modules/deadline/plugins/publish/collect_publishable_instances.py index b00381b6cf..347da86360 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/collect_publishable_instances.py +++ b/client/ayon_core/modules/deadline/plugins/publish/collect_publishable_instances.py @@ -5,7 +5,7 @@ import os import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class CollectDeadlinePublishableInstances(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py index 009375e87e..cc446e7faf 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py @@ -4,15 +4,15 @@ import getpass import pyblish.api from datetime import datetime -from openpype.lib import ( +from ayon_core.lib import ( env_value_to_bool, collect_frames, ) -from openpype.pipeline import legacy_io +from ayon_core.pipeline import legacy_io from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo -from openpype.tests.lib import is_in_tests -from openpype.lib import is_running_from_build +from ayon_core.tests.lib import is_in_tests +from ayon_core.lib import is_running_from_build @attr.s diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py index 8f9e9a7425..1dc19b0d11 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py @@ -6,16 +6,16 @@ import getpass import attr from datetime import datetime -from openpype.lib import ( +from ayon_core.lib import ( is_running_from_build, BoolDef, NumberDef, TextDef, ) -from openpype.pipeline import legacy_io -from openpype.pipeline.publish import OpenPypePyblishPluginMixin -from openpype.pipeline.farm.tools import iter_expected_files -from openpype.tests.lib import is_in_tests +from ayon_core.pipeline import legacy_io +from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.pipeline.farm.tools import iter_expected_files +from ayon_core.tests.lib import is_in_tests from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo 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 9a718aa089..a7b9b3ea14 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 @@ -6,12 +6,12 @@ import requests import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import legacy_io -from openpype.pipeline.publish import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import legacy_io +from ayon_core.pipeline.publish import ( OpenPypePyblishPluginMixin ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef, NumberDef, is_running_from_build @@ -95,7 +95,7 @@ class FusionSubmitDeadline( else: context.data[key] = True - from openpype.hosts.fusion.api.lib import get_frame_path + from ayon_core.hosts.fusion.api.lib import get_frame_path # get default deadline webservice url from deadline module deadline_url = instance.context.data["defaultDeadline"] diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py index 17e672334c..31a9160348 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py @@ -10,11 +10,11 @@ from datetime import datetime import attr import pyblish.api -from openpype.pipeline import legacy_io +from ayon_core.pipeline import legacy_io from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo -from openpype.tests.lib import is_in_tests -from openpype.lib import is_running_from_build +from ayon_core.tests.lib import is_in_tests +from ayon_core.lib import is_running_from_build class _ZipFile(ZipFile): diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py index ada69575a8..d548a59c4e 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py @@ -4,16 +4,16 @@ from datetime import datetime import attr import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( TextDef, NumberDef, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( legacy_io, OpenPypePyblishPluginMixin ) -from openpype.tests.lib import is_in_tests -from openpype.lib import is_running_from_build +from ayon_core.tests.lib import is_in_tests +from ayon_core.lib import is_running_from_build from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_remote_publish.py b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_remote_publish.py index 0bee42c4cb..d1ac152715 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_remote_publish.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_remote_publish.py @@ -6,9 +6,9 @@ import requests import pyblish.api -from openpype.pipeline import legacy_io -from openpype.tests.lib import is_in_tests -from openpype.lib import is_running_from_build +from ayon_core.pipeline import legacy_io +from ayon_core.tests.lib import is_in_tests +from ayon_core.lib import is_running_from_build class HoudiniSubmitPublishDeadline(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py index bf7fb45a8b..e1b92a2769 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py @@ -5,11 +5,11 @@ from datetime import datetime import pyblish.api -from openpype.pipeline import legacy_io, OpenPypePyblishPluginMixin -from openpype.tests.lib import is_in_tests +from ayon_core.pipeline import legacy_io, OpenPypePyblishPluginMixin +from ayon_core.tests.lib import is_in_tests from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo -from openpype.lib import ( +from ayon_core.lib import ( is_running_from_build, BoolDef, NumberDef diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py index f06bd4dbe6..99f9454ca6 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py @@ -3,27 +3,27 @@ import getpass import copy import attr -from openpype.lib import ( +from ayon_core.lib import ( TextDef, BoolDef, NumberDef, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( legacy_io, OpenPypePyblishPluginMixin ) -from openpype.pipeline.publish.lib import ( +from ayon_core.pipeline.publish.lib import ( replace_with_published_scene_path ) -from openpype.pipeline.publish import KnownPublishError -from openpype.hosts.max.api.lib import ( +from ayon_core.pipeline.publish import KnownPublishError +from ayon_core.hosts.max.api.lib import ( get_current_renderer, get_multipass_setting ) -from openpype.hosts.max.api.lib_rendersettings import RenderSettings +from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo -from openpype.lib import is_running_from_build +from ayon_core.lib import is_running_from_build @attr.s @@ -200,11 +200,11 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, def _use_published_name(self, data, project_settings): # Not all hosts can import these modules. - from openpype.hosts.max.api.lib import ( + from ayon_core.hosts.max.api.lib import ( get_current_renderer, get_multipass_setting ) - from openpype.hosts.max.api.lib_rendersettings import RenderSettings + from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings instance = self._instance job_info = copy.deepcopy(self.job_info) diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py index 5591db151a..23d0c6370a 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py @@ -28,24 +28,24 @@ from collections import OrderedDict import attr -from openpype.pipeline import ( +from ayon_core.pipeline import ( legacy_io, OpenPypePyblishPluginMixin ) -from openpype.lib import ( +from ayon_core.lib import ( BoolDef, NumberDef, TextDef, EnumDef ) -from openpype.hosts.maya.api.lib_rendersettings import RenderSettings -from openpype.hosts.maya.api.lib import get_attr_in_layer +from ayon_core.hosts.maya.api.lib_rendersettings import RenderSettings +from ayon_core.hosts.maya.api.lib import get_attr_in_layer from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo -from openpype.tests.lib import is_in_tests -from openpype.lib import is_running_from_build -from openpype.pipeline.farm.tools import iter_expected_files +from ayon_core.tests.lib import is_in_tests +from ayon_core.lib import is_running_from_build +from ayon_core.pipeline.farm.tools import iter_expected_files def _validate_deadline_bool_value(instance, attribute, value): diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py index 41a2a64ab5..89fc2e59f1 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py @@ -2,10 +2,10 @@ import os import attr from datetime import datetime -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import legacy_io, PublishXmlValidationError -from openpype.tests.lib import is_in_tests -from openpype.lib import is_running_from_build +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import legacy_io, PublishXmlValidationError +from ayon_core.tests.lib import is_in_tests +from ayon_core.lib import is_running_from_build from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py index 746b009255..e6b641dc77 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -7,13 +7,13 @@ from datetime import datetime import requests import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import legacy_io -from openpype.pipeline.publish import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import legacy_io +from ayon_core.pipeline.publish import ( OpenPypePyblishPluginMixin ) -from openpype.tests.lib import is_in_tests -from openpype.lib import ( +from ayon_core.tests.lib import is_in_tests +from ayon_core.lib import ( is_running_from_build, BoolDef, NumberDef diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py index 1bb45b77cc..ca926c869c 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py @@ -8,16 +8,16 @@ import requests import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_last_version_by_subset_name, ) -from openpype.pipeline import publish, legacy_io -from openpype.lib import EnumDef, is_running_from_build -from openpype.tests.lib import is_in_tests -from openpype.pipeline.version_start import get_versioning_start +from ayon_core.pipeline import publish, legacy_io +from ayon_core.lib import EnumDef, is_running_from_build +from ayon_core.tests.lib import is_in_tests +from ayon_core.pipeline.version_start import get_versioning_start -from openpype.pipeline.farm.pyblish_functions import ( +from ayon_core.pipeline.farm.pyblish_functions import ( create_skeleton_instance_cache, create_instances_for_cache, attach_instances_to_subset, diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py index 82971daee5..ca4d51d273 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py @@ -9,16 +9,16 @@ import clique import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_last_version_by_subset_name, ) -from openpype.pipeline import publish, legacy_io -from openpype.lib import EnumDef, is_running_from_build -from openpype.tests.lib import is_in_tests -from openpype.pipeline.version_start import get_versioning_start +from ayon_core.pipeline import publish, legacy_io +from ayon_core.lib import EnumDef, is_running_from_build +from ayon_core.tests.lib import is_in_tests +from ayon_core.pipeline.version_start import get_versioning_start -from openpype.pipeline.farm.pyblish_functions import ( +from ayon_core.pipeline.farm.pyblish_functions import ( create_skeleton_instance, create_instances_for_aov, attach_instances_to_subset, diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py index 90b8241803..2feb044cf1 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py +++ b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py @@ -1,10 +1,10 @@ import pyblish.api -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishXmlValidationError, OptionalPyblishPluginMixin ) -from openpype.modules.deadline.deadline_module import DeadlineModule +from ayon_core.modules.deadline.deadline_module import DeadlineModule class ValidateDeadlinePools(OptionalPyblishPluginMixin, diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py index 5d37e7357e..a666c5c2dc 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py +++ b/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py @@ -3,7 +3,7 @@ import requests import pyblish.api -from openpype.lib import collect_frames +from ayon_core.lib import collect_frames from openpype_modules.deadline.abstract_submit_deadline import requests_get diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py b/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py index 004c58d346..ea30fbb5d6 100644 --- a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py +++ b/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py @@ -30,7 +30,7 @@ def CleanupDeadlinePlugin(deadlinePlugin): class OpenPypeDeadlinePlugin(DeadlinePlugin): """ - Standalone plugin for publishing from OpenPype. + Standalone plugin for publishing from ayon_core. Calls OpenPype executable 'openpype_console' from first correctly found file based on plugin configuration. Uses 'publish' command and passes diff --git a/client/ayon_core/modules/interfaces.py b/client/ayon_core/modules/interfaces.py index 0d73bc35a3..863961c026 100644 --- a/client/ayon_core/modules/interfaces.py +++ b/client/ayon_core/modules/interfaces.py @@ -2,7 +2,7 @@ from abc import ABCMeta, abstractmethod, abstractproperty import six -from openpype import resources +from ayon_core import resources class _OpenPypeInterfaceMeta(ABCMeta): diff --git a/client/ayon_core/modules/job_queue/module.py b/client/ayon_core/modules/job_queue/module.py index 6792cd2aca..78bb1f26fe 100644 --- a/client/ayon_core/modules/job_queue/module.py +++ b/client/ayon_core/modules/job_queue/module.py @@ -41,8 +41,8 @@ import json import copy import platform -from openpype.modules import OpenPypeModule, click_wrap -from openpype.settings import get_system_settings +from ayon_core.modules import OpenPypeModule, click_wrap +from ayon_core.settings import get_system_settings class JobQueueModule(OpenPypeModule): @@ -172,7 +172,7 @@ class JobQueueModule(OpenPypeModule): @classmethod def start_worker(cls, app_name, server_url=None): import requests - from openpype.lib import ApplicationManager + from ayon_core.lib import ApplicationManager if not server_url: server_url = cls.get_server_url_from_settings() @@ -200,7 +200,7 @@ class JobQueueModule(OpenPypeModule): @classmethod def _start_tvpaint_worker(cls, app, server_url): - from openpype.hosts.tvpaint.worker import main + from ayon_core.hosts.tvpaint.worker import main executable = app.find_executable() if not executable: diff --git a/client/ayon_core/modules/launcher_action.py b/client/ayon_core/modules/launcher_action.py index 4f0674c94f..f7ea6fc63c 100644 --- a/client/ayon_core/modules/launcher_action.py +++ b/client/ayon_core/modules/launcher_action.py @@ -1,7 +1,7 @@ import os -from openpype import PLUGINS_DIR, AYON_SERVER_ENABLED -from openpype.modules import ( +from ayon_core import AYON_CORE_ROOT, AYON_SERVER_ENABLED +from ayon_core.modules import ( OpenPypeModule, ITrayAction, ) @@ -31,9 +31,9 @@ class LauncherAction(OpenPypeModule, ITrayAction): if not self.tray_initialized: return - from openpype.pipeline.actions import register_launcher_action_path + from ayon_core.pipeline.actions import register_launcher_action_path - actions_dir = os.path.join(PLUGINS_DIR, "actions") + actions_dir = os.path.join(AYON_CORE_ROOT, "plugins", "actions") if os.path.exists(actions_dir): register_launcher_action_path(actions_dir) @@ -68,9 +68,9 @@ class LauncherAction(OpenPypeModule, ITrayAction): if self._window: return if AYON_SERVER_ENABLED: - from openpype.tools.ayon_launcher.ui import LauncherWindow + from ayon_core.tools.ayon_launcher.ui import LauncherWindow else: - from openpype.tools.launcher import LauncherWindow + from ayon_core.tools.launcher import LauncherWindow self._window = LauncherWindow() def _show_launcher(self): diff --git a/client/ayon_core/modules/log_viewer/log_view_module.py b/client/ayon_core/modules/log_viewer/log_view_module.py index 1cafbe4fbd..11de8ef887 100644 --- a/client/ayon_core/modules/log_viewer/log_view_module.py +++ b/client/ayon_core/modules/log_viewer/log_view_module.py @@ -1,5 +1,5 @@ -from openpype import AYON_SERVER_ENABLED -from openpype.modules import OpenPypeModule, ITrayModule +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.modules import OpenPypeModule, ITrayModule class LogViewModule(OpenPypeModule, ITrayModule): diff --git a/client/ayon_core/modules/log_viewer/tray/app.py b/client/ayon_core/modules/log_viewer/tray/app.py index 3c49f337d4..79ece8ca76 100644 --- a/client/ayon_core/modules/log_viewer/tray/app.py +++ b/client/ayon_core/modules/log_viewer/tray/app.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets, QtCore from .widgets import LogsWidget, OutputWidget -from openpype import style +from ayon_core import style class LogsWindow(QtWidgets.QWidget): diff --git a/client/ayon_core/modules/log_viewer/tray/models.py b/client/ayon_core/modules/log_viewer/tray/models.py index bc1f54c06c..05f09c5465 100644 --- a/client/ayon_core/modules/log_viewer/tray/models.py +++ b/client/ayon_core/modules/log_viewer/tray/models.py @@ -1,6 +1,6 @@ import collections from qtpy import QtCore, QtGui -from openpype.lib import Logger +from ayon_core.lib import Logger class LogModel(QtGui.QStandardItemModel): diff --git a/client/ayon_core/modules/python_console_interpreter/module.py b/client/ayon_core/modules/python_console_interpreter/module.py index cb99c05e37..7819c9cbf3 100644 --- a/client/ayon_core/modules/python_console_interpreter/module.py +++ b/client/ayon_core/modules/python_console_interpreter/module.py @@ -1,4 +1,4 @@ -from openpype.modules import OpenPypeModule, ITrayAction +from ayon_core.modules import OpenPypeModule, ITrayAction class PythonInterpreterAction(OpenPypeModule, ITrayAction): diff --git a/client/ayon_core/modules/python_console_interpreter/window/widgets.py b/client/ayon_core/modules/python_console_interpreter/window/widgets.py index d046c0de50..eae468e58b 100644 --- a/client/ayon_core/modules/python_console_interpreter/window/widgets.py +++ b/client/ayon_core/modules/python_console_interpreter/window/widgets.py @@ -7,10 +7,10 @@ from code import InteractiveInterpreter import appdirs from qtpy import QtCore, QtWidgets, QtGui -from openpype import resources -from openpype import AYON_SERVER_ENABLED -from openpype.style import load_stylesheet -from openpype.lib import JSONSettingRegistry +from ayon_core import resources +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.style import load_stylesheet +from ayon_core.lib import JSONSettingRegistry diff --git a/client/ayon_core/modules/royalrender/api.py b/client/ayon_core/modules/royalrender/api.py index e610a0c8a8..c46d1c0868 100644 --- a/client/ayon_core/modules/royalrender/api.py +++ b/client/ayon_core/modules/royalrender/api.py @@ -3,10 +3,10 @@ import sys import os -from openpype.lib.local_settings import OpenPypeSettingsRegistry -from openpype.lib import Logger, run_subprocess +from ayon_core.lib.local_settings import OpenPypeSettingsRegistry +from ayon_core.lib import Logger, run_subprocess from .rr_job import RRJob, SubmitFile, SubmitterParameter -from openpype.lib.vendor_bin_utils import find_tool_in_custom_paths +from ayon_core.lib.vendor_bin_utils import find_tool_in_custom_paths class Api: diff --git a/client/ayon_core/modules/royalrender/lib.py b/client/ayon_core/modules/royalrender/lib.py index 9c4221d9cd..d3aa95d8da 100644 --- a/client/ayon_core/modules/royalrender/lib.py +++ b/client/ayon_core/modules/royalrender/lib.py @@ -10,19 +10,19 @@ from datetime import datetime import pyblish.api -from openpype.lib import BoolDef, NumberDef, is_running_from_build -from openpype.lib.execute import run_openpype_process -from openpype.modules.royalrender.api import Api as rrApi -from openpype.modules.royalrender.rr_job import ( +from ayon_core.lib import BoolDef, NumberDef, is_running_from_build +from ayon_core.lib.execute import run_openpype_process +from ayon_core.modules.royalrender.api import Api as rrApi +from ayon_core.modules.royalrender.rr_job import ( CustomAttribute, RRJob, RREnvList, get_rr_platform, ) -from openpype.pipeline import OpenPypePyblishPluginMixin -from openpype.pipeline.publish import KnownPublishError -from openpype.pipeline.publish.lib import get_published_workfile_instance -from openpype.tests.lib import is_in_tests +from ayon_core.pipeline import OpenPypePyblishPluginMixin +from ayon_core.pipeline.publish import KnownPublishError +from ayon_core.pipeline.publish.lib import get_published_workfile_instance +from ayon_core.tests.lib import is_in_tests class BaseCreateRoyalRenderJob(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/modules/royalrender/plugins/publish/collect_sequences_from_job.py b/client/ayon_core/modules/royalrender/plugins/publish/collect_sequences_from_job.py index 1bfee19e3d..8a076e7817 100644 --- a/client/ayon_core/modules/royalrender/plugins/publish/collect_sequences_from_job.py +++ b/client/ayon_core/modules/royalrender/plugins/publish/collect_sequences_from_job.py @@ -8,7 +8,7 @@ from pprint import pformat import pyblish.api -from openpype.pipeline import legacy_io +from ayon_core.pipeline import legacy_io def collect(root, diff --git a/client/ayon_core/modules/royalrender/plugins/publish/create_maya_royalrender_job.py b/client/ayon_core/modules/royalrender/plugins/publish/create_maya_royalrender_job.py index 775a2964fd..d205b32b7d 100644 --- a/client/ayon_core/modules/royalrender/plugins/publish/create_maya_royalrender_job.py +++ b/client/ayon_core/modules/royalrender/plugins/publish/create_maya_royalrender_job.py @@ -4,8 +4,8 @@ import os from maya.OpenMaya import MGlobal # noqa: F401 -from openpype.modules.royalrender import lib -from openpype.pipeline.farm.tools import iter_expected_files +from ayon_core.modules.royalrender import lib +from ayon_core.pipeline.farm.tools import iter_expected_files class CreateMayaRoyalRenderJob(lib.BaseCreateRoyalRenderJob): diff --git a/client/ayon_core/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py b/client/ayon_core/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py index 4f589e56f8..4234535b23 100644 --- a/client/ayon_core/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py +++ b/client/ayon_core/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py @@ -2,7 +2,7 @@ """Submitting render job to RoyalRender.""" import re -from openpype.modules.royalrender import lib +from ayon_core.modules.royalrender import lib class CreateNukeRoyalRenderJob(lib.BaseCreateRoyalRenderJob): diff --git a/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py b/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py index d4af1c2aee..dc5d722133 100644 --- a/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py +++ b/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py @@ -7,23 +7,23 @@ import re import pyblish.api -from openpype.modules.royalrender.rr_job import ( +from ayon_core.modules.royalrender.rr_job import ( RRJob, RREnvList, get_rr_platform ) -from openpype.pipeline.publish import KnownPublishError -from openpype.pipeline import ( +from ayon_core.pipeline.publish import KnownPublishError +from ayon_core.pipeline import ( legacy_io, ) -from openpype.pipeline.farm.pyblish_functions import ( +from ayon_core.pipeline.farm.pyblish_functions import ( create_skeleton_instance, create_instances_for_aov, attach_instances_to_subset, prepare_representations, create_metadata_path ) -from openpype.pipeline import publish +from ayon_core.pipeline import publish class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin, diff --git a/client/ayon_core/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py b/client/ayon_core/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py index 8fc8604b83..a76bdfc26c 100644 --- a/client/ayon_core/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py +++ b/client/ayon_core/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py @@ -4,12 +4,12 @@ import tempfile import platform import pyblish.api -from openpype.modules.royalrender.api import ( +from ayon_core.modules.royalrender.api import ( RRJob, Api as rrApi, SubmitterParameter ) -from openpype.pipeline.publish import KnownPublishError +from ayon_core.pipeline.publish import KnownPublishError class SubmitJobsToRoyalRender(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/modules/royalrender/royal_render_module.py b/client/ayon_core/modules/royalrender/royal_render_module.py index 10d74d01d1..ddcb9a5494 100644 --- a/client/ayon_core/modules/royalrender/royal_render_module.py +++ b/client/ayon_core/modules/royalrender/royal_render_module.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """Module providing support for Royal Render.""" import os -import openpype.modules -from openpype.modules import OpenPypeModule, IPluginPaths +import ayon_core.modules +from ayon_core.modules import OpenPypeModule, IPluginPaths class RoyalRenderModule(OpenPypeModule, IPluginPaths): diff --git a/client/ayon_core/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py b/client/ayon_core/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py index cdc37588cd..7118c5ebef 100644 --- a/client/ayon_core/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py +++ b/client/ayon_core/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """This is RR control plugin that runs on the job by user interaction. -It asks user for context to publish, getting it from OpenPype. In order to +It asks user for context to publish, getting it from ayon_core. In order to run it needs `OPENPYPE_ROOT` to be set to know where to execute OpenPype. """ diff --git a/client/ayon_core/modules/timers_manager/idle_threads.py b/client/ayon_core/modules/timers_manager/idle_threads.py index eb11bbf117..d70f7790c4 100644 --- a/client/ayon_core/modules/timers_manager/idle_threads.py +++ b/client/ayon_core/modules/timers_manager/idle_threads.py @@ -2,7 +2,7 @@ import time from qtpy import QtCore from pynput import mouse, keyboard -from openpype.lib import Logger +from ayon_core.lib import Logger class IdleItem: diff --git a/client/ayon_core/modules/timers_manager/launch_hooks/post_start_timer.py b/client/ayon_core/modules/timers_manager/launch_hooks/post_start_timer.py index 76c3cca33e..a50860089f 100644 --- a/client/ayon_core/modules/timers_manager/launch_hooks/post_start_timer.py +++ b/client/ayon_core/modules/timers_manager/launch_hooks/post_start_timer.py @@ -1,4 +1,4 @@ -from openpype.lib.applications import PostLaunchHook, LaunchTypes +from ayon_core.lib.applications import PostLaunchHook, LaunchTypes class PostStartTimerHook(PostLaunchHook): diff --git a/client/ayon_core/modules/timers_manager/rest_api.py b/client/ayon_core/modules/timers_manager/rest_api.py index 979db9075b..b460719f80 100644 --- a/client/ayon_core/modules/timers_manager/rest_api.py +++ b/client/ayon_core/modules/timers_manager/rest_api.py @@ -1,7 +1,7 @@ import json from aiohttp.web_response import Response -from openpype.lib import Logger +from ayon_core.lib import Logger class TimersManagerModuleRestApi: diff --git a/client/ayon_core/modules/timers_manager/timers_manager.py b/client/ayon_core/modules/timers_manager/timers_manager.py index 674d834a1d..67f943ac85 100644 --- a/client/ayon_core/modules/timers_manager/timers_manager.py +++ b/client/ayon_core/modules/timers_manager/timers_manager.py @@ -2,13 +2,13 @@ import os import platform -from openpype.client import get_asset_by_name -from openpype.modules import ( +from ayon_core.client import get_asset_by_name +from ayon_core.modules import ( OpenPypeModule, ITrayService, IPluginPaths ) -from openpype.lib.events import register_event_callback +from ayon_core.lib.events import register_event_callback from .exceptions import InvalidContextError diff --git a/client/ayon_core/modules/timers_manager/widget_user_idle.py b/client/ayon_core/modules/timers_manager/widget_user_idle.py index 9df328e6b2..1f60cfba8c 100644 --- a/client/ayon_core/modules/timers_manager/widget_user_idle.py +++ b/client/ayon_core/modules/timers_manager/widget_user_idle.py @@ -1,5 +1,5 @@ from qtpy import QtCore, QtGui, QtWidgets -from openpype import resources, style +from ayon_core import resources, style class WidgetUserIdle(QtWidgets.QWidget): diff --git a/client/ayon_core/modules/webserver/host_console_listener.py b/client/ayon_core/modules/webserver/host_console_listener.py index e5c11af9c2..d9be46746b 100644 --- a/client/ayon_core/modules/webserver/host_console_listener.py +++ b/client/ayon_core/modules/webserver/host_console_listener.py @@ -5,7 +5,7 @@ import logging from concurrent.futures import CancelledError from qtpy import QtWidgets -from openpype.modules import ITrayService +from ayon_core.modules import ITrayService log = logging.getLogger(__name__) @@ -34,7 +34,7 @@ class HostListener: webserver.add_route('*', "/ws/host_listener", self.websocket_handler) def _host_is_connecting(self, host_name, label): - from openpype.tools.stdout_broker.window import ConsoleDialog + from ayon_core.tools.stdout_broker.window import ConsoleDialog """ Initialize dialog, adds to submenu. """ services_submenu = self.module._services_submenu action = QtWidgets.QAction(label, services_submenu) diff --git a/client/ayon_core/modules/webserver/server.py b/client/ayon_core/modules/webserver/server.py index 120925a362..99d9badb6a 100644 --- a/client/ayon_core/modules/webserver/server.py +++ b/client/ayon_core/modules/webserver/server.py @@ -4,7 +4,7 @@ import asyncio from aiohttp import web -from openpype.lib import Logger +from ayon_core.lib import Logger from .cors_middleware import cors_middleware diff --git a/client/ayon_core/modules/webserver/webserver_module.py b/client/ayon_core/modules/webserver/webserver_module.py index 354ab1e4f9..b02de6c640 100644 --- a/client/ayon_core/modules/webserver/webserver_module.py +++ b/client/ayon_core/modules/webserver/webserver_module.py @@ -23,8 +23,8 @@ of server. import os import socket -from openpype import resources -from openpype.modules import OpenPypeModule, ITrayService +from ayon_core import resources +from ayon_core.modules import OpenPypeModule, ITrayService class WebServerModule(OpenPypeModule, ITrayService): diff --git a/client/ayon_core/pipeline/actions.py b/client/ayon_core/pipeline/actions.py index 68533f7485..1701498d10 100644 --- a/client/ayon_core/pipeline/actions.py +++ b/client/ayon_core/pipeline/actions.py @@ -1,5 +1,5 @@ import logging -from openpype.pipeline.plugin_discover import ( +from ayon_core.pipeline.plugin_discover import ( discover, register_plugin, register_plugin_path, diff --git a/client/ayon_core/pipeline/anatomy.py b/client/ayon_core/pipeline/anatomy.py index 0e5ab1d42e..55dc3c38b2 100644 --- a/client/ayon_core/pipeline/anatomy.py +++ b/client/ayon_core/pipeline/anatomy.py @@ -8,23 +8,23 @@ import numbers import six import time -from openpype import AYON_SERVER_ENABLED -from openpype.settings.lib import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.settings.lib import ( get_local_settings, ) -from openpype.settings.constants import ( +from ayon_core.settings.constants import ( DEFAULT_PROJECT_KEY ) -from openpype.client import get_project, get_ayon_server_api_connection -from openpype.lib import Logger, get_local_site_id -from openpype.lib.path_templates import ( +from ayon_core.client import get_project, get_ayon_server_api_connection +from ayon_core.lib import Logger, get_local_site_id +from ayon_core.lib.path_templates import ( TemplateUnsolved, TemplateResult, StringTemplate, TemplatesDict, FormatObject, ) -from openpype.modules import ModulesManager +from ayon_core.modules import ModulesManager log = Logger.get_logger(__name__) diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py index 9f720f6ae9..cc46cf3560 100644 --- a/client/ayon_core/pipeline/colorspace.py +++ b/client/ayon_core/pipeline/colorspace.py @@ -8,15 +8,15 @@ import tempfile import warnings from copy import deepcopy -from openpype import PACKAGE_DIR -from openpype.settings import get_project_settings -from openpype.lib import ( +from ayon_core import AYON_CORE_ROOT +from ayon_core.settings import get_project_settings +from ayon_core.lib import ( StringTemplate, run_openpype_process, Logger ) -from openpype.pipeline import Anatomy -from openpype.lib.transcoding import VIDEO_EXTENSIONS, IMAGE_EXTENSIONS +from ayon_core.pipeline import Anatomy +from ayon_core.lib.transcoding import VIDEO_EXTENSIONS, IMAGE_EXTENSIONS log = Logger.get_logger(__name__) @@ -113,7 +113,7 @@ def get_ocio_config_script_path(): """ return os.path.normpath( os.path.join( - PACKAGE_DIR, + AYON_CORE_ROOT, "scripts", "ocio_wrapper.py" ) @@ -295,7 +295,7 @@ def get_config_file_rules_colorspace_from_filepath(config_path, filepath): return result_data[0] # TODO: refactor this so it is not imported but part of this file - from openpype.scripts.ocio_wrapper import _get_config_file_rules_colorspace_from_filepath # noqa: E501 + from ayon_core.scripts.ocio_wrapper import _get_config_file_rules_colorspace_from_filepath # noqa: E501 result_data = _get_config_file_rules_colorspace_from_filepath( config_path, filepath) @@ -478,7 +478,7 @@ def compatibility_check_config_version(config_path, major=1, minor=None): if not CachedData.config_version_data.get(config_path): if compatibility_check(): # TODO: refactor this so it is not imported but part of this file - from openpype.scripts.ocio_wrapper import _get_version_data + from ayon_core.scripts.ocio_wrapper import _get_version_data CachedData.config_version_data[config_path] = \ _get_version_data(config_path) @@ -525,7 +525,7 @@ def get_ocio_config_colorspaces(config_path): ) else: # TODO: refactor this so it is not imported but part of this file - from openpype.scripts.ocio_wrapper import _get_colorspace_data + from ayon_core.scripts.ocio_wrapper import _get_colorspace_data CachedData.ocio_config_colorspaces[config_path] = \ _get_colorspace_data(config_path) @@ -722,7 +722,7 @@ def get_ocio_config_views(config_path): ) # TODO: refactor this so it is not imported but part of this file - from openpype.scripts.ocio_wrapper import _get_views_data + from ayon_core.scripts.ocio_wrapper import _get_views_data return _get_views_data(config_path) @@ -773,7 +773,7 @@ def get_imageio_config( anatomy = anatomy or Anatomy(project_name) if not anatomy_data: - from openpype.pipeline.context_tools import ( + from ayon_core.pipeline.context_tools import ( get_template_data_from_session) anatomy_data = get_template_data_from_session() @@ -1157,7 +1157,7 @@ def get_display_view_colorspace_name(config_path, display, view): return get_display_view_colorspace_subprocess(config_path, display, view) - from openpype.scripts.ocio_wrapper import _get_display_view_colorspace_name # noqa + from ayon_core.scripts.ocio_wrapper import _get_display_view_colorspace_name # noqa return _get_display_view_colorspace_name(config_path, display, view) diff --git a/client/ayon_core/pipeline/context_tools.py b/client/ayon_core/pipeline/context_tools.py index a607c90912..577b732e0f 100644 --- a/client/ayon_core/pipeline/context_tools.py +++ b/client/ayon_core/pipeline/context_tools.py @@ -10,10 +10,9 @@ import uuid import pyblish.api from pyblish.lib import MessageHandler -import openpype -from openpype import AYON_SERVER_ENABLED -from openpype.host import HostBase -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED, AYON_CORE_ROOT +from ayon_core.host import HostBase +from ayon_core.client import ( get_project, get_asset_by_id, get_asset_by_name, @@ -21,10 +20,10 @@ from openpype.client import ( get_asset_name_identifier, get_ayon_server_api_connection, ) -from openpype.lib.events import emit_event -from openpype.modules import load_modules, ModulesManager -from openpype.settings import get_project_settings -from openpype.tests.lib import is_in_tests +from ayon_core.lib.events import emit_event +from ayon_core.modules import load_modules, ModulesManager +from ayon_core.settings import get_project_settings +from ayon_core.tests.lib import is_in_tests from .publish.lib import filter_pyblish_plugins from .anatomy import Anatomy @@ -53,8 +52,7 @@ _modules_manager = None log = logging.getLogger(__name__) -PACKAGE_DIR = os.path.dirname(os.path.abspath(openpype.__file__)) -PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins") +PLUGINS_DIR = os.path.join(AYON_CORE_ROOT, "plugins") # Global plugin paths PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index 683699a0d1..27f0cd478a 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -11,25 +11,25 @@ from contextlib import contextmanager import pyblish.logic import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_assets, get_asset_by_name, get_asset_name_identifier, ) -from openpype.settings import ( +from ayon_core.settings import ( get_system_settings, get_project_settings ) -from openpype.lib.attribute_definitions import ( +from ayon_core.lib.attribute_definitions import ( UnknownDef, serialize_attr_defs, deserialize_attr_defs, get_default_values, ) -from openpype.host import IPublishHost, IWorkfileHost -from openpype.pipeline import legacy_io, Anatomy -from openpype.pipeline.plugin_discover import DiscoverResult +from ayon_core.host import IPublishHost, IWorkfileHost +from ayon_core.pipeline import legacy_io, Anatomy +from ayon_core.pipeline.plugin_discover import DiscoverResult from .creator_plugins import ( Creator, @@ -1744,8 +1744,8 @@ class CreateContext: self._reset_convertor_plugins() def _reset_publish_plugins(self, discover_publish_plugins): - from openpype.pipeline import OpenPypePyblishPluginMixin - from openpype.pipeline.publish import ( + from ayon_core.pipeline import OpenPypePyblishPluginMixin + from ayon_core.pipeline.publish import ( publish_plugins_discover ) diff --git a/client/ayon_core/pipeline/create/creator_plugins.py b/client/ayon_core/pipeline/create/creator_plugins.py index b51f69379c..643e88d335 100644 --- a/client/ayon_core/pipeline/create/creator_plugins.py +++ b/client/ayon_core/pipeline/create/creator_plugins.py @@ -6,9 +6,9 @@ from abc import ABCMeta, abstractmethod import six -from openpype.settings import get_system_settings, get_project_settings -from openpype.lib import Logger, is_func_signature_supported -from openpype.pipeline.plugin_discover import ( +from ayon_core.settings import get_system_settings, get_project_settings +from ayon_core.lib import Logger, is_func_signature_supported +from ayon_core.pipeline.plugin_discover import ( discover, register_plugin, register_plugin_path, @@ -832,7 +832,7 @@ def discover_convertor_plugins(*args, **kwargs): def discover_legacy_creator_plugins(): - from openpype.pipeline import get_current_project_name + from ayon_core.pipeline import get_current_project_name log = Logger.get_logger("CreatorDiscover") diff --git a/client/ayon_core/pipeline/create/legacy_create.py b/client/ayon_core/pipeline/create/legacy_create.py index 50ef274633..08be32eed4 100644 --- a/client/ayon_core/pipeline/create/legacy_create.py +++ b/client/ayon_core/pipeline/create/legacy_create.py @@ -9,7 +9,7 @@ import os import logging import collections -from openpype.client import get_asset_by_id +from ayon_core.client import get_asset_by_id from .subset_name import get_subset_name @@ -191,7 +191,7 @@ def legacy_create(Creator, name, asset, options=None, data=None): Name of instance """ - from openpype.pipeline import registered_host + from ayon_core.pipeline import registered_host host = registered_host() plugin = Creator(name, asset, options, data) diff --git a/client/ayon_core/pipeline/create/subset_name.py b/client/ayon_core/pipeline/create/subset_name.py index 00025b19b8..3892971ce8 100644 --- a/client/ayon_core/pipeline/create/subset_name.py +++ b/client/ayon_core/pipeline/create/subset_name.py @@ -1,8 +1,8 @@ import os -from openpype.settings import get_project_settings -from openpype.lib import filter_profiles, prepare_template_data -from openpype.pipeline import legacy_io +from ayon_core.settings import get_project_settings +from ayon_core.lib import filter_profiles, prepare_template_data +from ayon_core.pipeline import legacy_io from .constants import DEFAULT_SUBSET_TEMPLATE diff --git a/client/ayon_core/pipeline/create/utils.py b/client/ayon_core/pipeline/create/utils.py index ce4af8f474..0547c20c0a 100644 --- a/client/ayon_core/pipeline/create/utils.py +++ b/client/ayon_core/pipeline/create/utils.py @@ -1,6 +1,6 @@ import collections -from openpype.client import ( +from ayon_core.client import ( get_assets, get_subsets, get_last_versions, diff --git a/client/ayon_core/pipeline/delivery.py b/client/ayon_core/pipeline/delivery.py index bbd01f7a4e..cb90e67090 100644 --- a/client/ayon_core/pipeline/delivery.py +++ b/client/ayon_core/pipeline/delivery.py @@ -6,7 +6,7 @@ import glob import clique import collections -from openpype.lib import create_hard_link +from ayon_core.lib import create_hard_link def _copy_file(src_path, dst_path): diff --git a/client/ayon_core/pipeline/farm/pyblish_functions.py b/client/ayon_core/pipeline/farm/pyblish_functions.py index 975fdd31cc..9423d8501c 100644 --- a/client/ayon_core/pipeline/farm/pyblish_functions.py +++ b/client/ayon_core/pipeline/farm/pyblish_functions.py @@ -7,18 +7,18 @@ from copy import deepcopy import re import warnings -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_current_project_name, get_representation_path, Anatomy, ) -from openpype.client import ( +from ayon_core.client import ( get_last_version_by_subset_name, get_representations ) -from openpype.lib import Logger -from openpype.pipeline.publish import KnownPublishError -from openpype.pipeline.farm.patterning import match_aov_pattern +from ayon_core.lib import Logger +from ayon_core.pipeline.publish import KnownPublishError +from ayon_core.pipeline.farm.patterning import match_aov_pattern @attr.s diff --git a/client/ayon_core/pipeline/farm/pyblish_functions.pyi b/client/ayon_core/pipeline/farm/pyblish_functions.pyi index 76f7c34dcd..d9d46a63be 100644 --- a/client/ayon_core/pipeline/farm/pyblish_functions.pyi +++ b/client/ayon_core/pipeline/farm/pyblish_functions.pyi @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline import Anatomy +from ayon_core.pipeline import Anatomy from typing import Tuple, Union, List diff --git a/client/ayon_core/pipeline/legacy_io.py b/client/ayon_core/pipeline/legacy_io.py index 864102dff9..3bfcc783e7 100644 --- a/client/ayon_core/pipeline/legacy_io.py +++ b/client/ayon_core/pipeline/legacy_io.py @@ -4,7 +4,7 @@ import sys import logging import functools -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED from . import schema from .mongodb import AvalonMongoDB, session_data_from_environment diff --git a/client/ayon_core/pipeline/load/plugins.py b/client/ayon_core/pipeline/load/plugins.py index 8acfcfdb6c..766daf7e6d 100644 --- a/client/ayon_core/pipeline/load/plugins.py +++ b/client/ayon_core/pipeline/load/plugins.py @@ -1,12 +1,12 @@ import os import logging -from openpype.settings import get_system_settings, get_project_settings -from openpype.pipeline import ( +from ayon_core.settings import get_system_settings, get_project_settings +from ayon_core.pipeline import ( schema, legacy_io, ) -from openpype.pipeline.plugin_discover import ( +from ayon_core.pipeline.plugin_discover import ( discover, register_plugin, register_plugin_path, @@ -258,7 +258,7 @@ class SubsetLoaderPlugin(LoaderPlugin): def discover_loader_plugins(project_name=None): - from openpype.lib import Logger + from ayon_core.lib import Logger log = Logger.get_logger("LoaderDiscover") plugins = discover(LoaderPlugin) diff --git a/client/ayon_core/pipeline/load/utils.py b/client/ayon_core/pipeline/load/utils.py index c81aeff6bd..2565bd07d2 100644 --- a/client/ayon_core/pipeline/load/utils.py +++ b/client/ayon_core/pipeline/load/utils.py @@ -7,8 +7,8 @@ import inspect import collections import numbers -from openpype.host import ILoadHost -from openpype.client import ( +from ayon_core.host import ILoadHost +from ayon_core.client import ( get_project, get_assets, get_subsets, @@ -23,11 +23,11 @@ from openpype.client import ( get_representation_by_name, get_representation_parents ) -from openpype.lib import ( +from ayon_core.lib import ( StringTemplate, TemplateUnsolved, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( legacy_io, Anatomy, ) @@ -633,7 +633,7 @@ def get_representation_path(representation, root=None, dbcon=None): dbcon = legacy_io if root is None: - from openpype.pipeline import registered_root + from ayon_core.pipeline import registered_root root = registered_root() @@ -835,7 +835,7 @@ def get_outdated_containers(host=None, project_name=None): """ if host is None: - from openpype.pipeline import registered_host + from ayon_core.pipeline import registered_host host = registered_host() diff --git a/client/ayon_core/pipeline/mongodb.py b/client/ayon_core/pipeline/mongodb.py index c948983c3d..4c53fef3ed 100644 --- a/client/ayon_core/pipeline/mongodb.py +++ b/client/ayon_core/pipeline/mongodb.py @@ -5,8 +5,8 @@ import logging import pymongo from uuid import uuid4 -from openpype import AYON_SERVER_ENABLED -from openpype.client import OpenPypeMongoConnection +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import OpenPypeMongoConnection from . import schema diff --git a/client/ayon_core/pipeline/plugin_discover.py b/client/ayon_core/pipeline/plugin_discover.py index e5257b801a..f531600276 100644 --- a/client/ayon_core/pipeline/plugin_discover.py +++ b/client/ayon_core/pipeline/plugin_discover.py @@ -2,8 +2,8 @@ import os import inspect import traceback -from openpype.lib import Logger -from openpype.lib.python_module_tools import ( +from ayon_core.lib import Logger +from ayon_core.lib.python_module_tools import ( modules_from_path, classes_from_module, ) diff --git a/client/ayon_core/pipeline/project_folders.py b/client/ayon_core/pipeline/project_folders.py index 608344ce03..ad205522a6 100644 --- a/client/ayon_core/pipeline/project_folders.py +++ b/client/ayon_core/pipeline/project_folders.py @@ -4,8 +4,8 @@ import json import six -from openpype.settings import get_project_settings -from openpype.lib import Logger +from ayon_core.settings import get_project_settings +from ayon_core.lib import Logger from .anatomy import Anatomy from .template_data import get_project_template_data diff --git a/client/ayon_core/pipeline/publish/README.md b/client/ayon_core/pipeline/publish/README.md index 870d29314d..b367a35281 100644 --- a/client/ayon_core/pipeline/publish/README.md +++ b/client/ayon_core/pipeline/publish/README.md @@ -21,7 +21,7 @@ Publish plugins can be extended by additional logic when inherits from `OpenPype ```python import pyblish.api -from openpype.pipeline import OpenPypePyblishPluginMixin +from ayon_core.pipeline import OpenPypePyblishPluginMixin # Example context plugin diff --git a/client/ayon_core/pipeline/publish/lib.py b/client/ayon_core/pipeline/publish/lib.py index 40cb94e2bf..ec499a4e18 100644 --- a/client/ayon_core/pipeline/publish/lib.py +++ b/client/ayon_core/pipeline/publish/lib.py @@ -9,21 +9,21 @@ import pyblish.util import pyblish.plugin import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( Logger, import_filepath, filter_profiles, is_func_signature_supported, ) -from openpype.settings import ( +from ayon_core.settings import ( get_project_settings, get_system_settings, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( tempdir, Anatomy ) -from openpype.pipeline.plugin_discover import DiscoverResult +from ayon_core.pipeline.plugin_discover import DiscoverResult from .constants import ( DEFAULT_PUBLISH_TEMPLATE, diff --git a/client/ayon_core/pipeline/publish/publish_plugins.py b/client/ayon_core/pipeline/publish/publish_plugins.py index ae6cbc42d1..98ab38589c 100644 --- a/client/ayon_core/pipeline/publish/publish_plugins.py +++ b/client/ayon_core/pipeline/publish/publish_plugins.py @@ -2,8 +2,8 @@ import inspect from abc import ABCMeta import pyblish.api from pyblish.plugin import MetaPlugin, ExplicitMetaPlugin -from openpype.lib.transcoding import VIDEO_EXTENSIONS, IMAGE_EXTENSIONS -from openpype.lib import BoolDef +from ayon_core.lib.transcoding import VIDEO_EXTENSIONS, IMAGE_EXTENSIONS +from ayon_core.lib import BoolDef from .lib import ( load_help_content_from_plugin, @@ -12,7 +12,7 @@ from .lib import ( get_instance_staging_dir, ) -from openpype.pipeline.colorspace import ( +from ayon_core.pipeline.colorspace import ( get_colorspace_settings_from_publish_context, set_colorspace_data_to_representation ) diff --git a/client/ayon_core/pipeline/tempdir.py b/client/ayon_core/pipeline/tempdir.py index 55a1346b08..62de7d9ec4 100644 --- a/client/ayon_core/pipeline/tempdir.py +++ b/client/ayon_core/pipeline/tempdir.py @@ -3,8 +3,8 @@ Temporary folder operations """ import os -from openpype.lib import StringTemplate -from openpype.pipeline import Anatomy +from ayon_core.lib import StringTemplate +from ayon_core.pipeline import Anatomy def create_custom_tempdir(project_name, anatomy=None): diff --git a/client/ayon_core/pipeline/template_data.py b/client/ayon_core/pipeline/template_data.py index a48f0721b6..422a43f414 100644 --- a/client/ayon_core/pipeline/template_data.py +++ b/client/ayon_core/pipeline/template_data.py @@ -1,6 +1,6 @@ -from openpype.client import get_project, get_asset_by_name -from openpype.settings import get_system_settings -from openpype.lib.local_settings import get_openpype_username +from ayon_core.client import get_project, get_asset_by_name +from ayon_core.settings import get_system_settings +from ayon_core.lib.local_settings import get_openpype_username def get_general_template_data(system_settings=None): diff --git a/client/ayon_core/pipeline/thumbnail.py b/client/ayon_core/pipeline/thumbnail.py index 14fb8b06fc..f6dfad5cc1 100644 --- a/client/ayon_core/pipeline/thumbnail.py +++ b/client/ayon_core/pipeline/thumbnail.py @@ -2,9 +2,9 @@ import os import copy import logging -from openpype import AYON_SERVER_ENABLED -from openpype.lib import Logger -from openpype.client import get_project, get_ayon_server_api_connection +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.lib import Logger +from ayon_core.client import get_project, get_ayon_server_api_connection from . import legacy_io from .anatomy import Anatomy from .plugin_discover import ( @@ -139,7 +139,7 @@ class ServerThumbnailResolver(ThumbnailResolver): @classmethod def _get_cache(cls): if cls._cache is None: - from openpype.client.server.thumbnails import AYONThumbnailCache + from ayon_core.client.server.thumbnails import AYONThumbnailCache cls._cache = AYONThumbnailCache() return cls._cache diff --git a/client/ayon_core/pipeline/version_start.py b/client/ayon_core/pipeline/version_start.py index 0240ab0c7a..bd7d800335 100644 --- a/client/ayon_core/pipeline/version_start.py +++ b/client/ayon_core/pipeline/version_start.py @@ -1,5 +1,5 @@ -from openpype.lib.profiles_filtering import filter_profiles -from openpype.settings import get_project_settings +from ayon_core.lib.profiles_filtering import filter_profiles +from ayon_core.settings import get_project_settings def get_versioning_start( diff --git a/client/ayon_core/pipeline/workfile/build_workfile.py b/client/ayon_core/pipeline/workfile/build_workfile.py index 7b153d37b9..58db561c8e 100644 --- a/client/ayon_core/pipeline/workfile/build_workfile.py +++ b/client/ayon_core/pipeline/workfile/build_workfile.py @@ -13,19 +13,19 @@ import re import collections import json -from openpype.client import ( +from ayon_core.client import ( get_asset_by_name, get_subsets, get_last_versions, get_representations, get_linked_assets, ) -from openpype.settings import get_project_settings -from openpype.lib import ( +from ayon_core.settings import get_project_settings +from ayon_core.lib import ( filter_profiles, Logger, ) -from openpype.pipeline.load import ( +from ayon_core.pipeline.load import ( discover_loader_plugins, IncompatibleLoaderError, load_container, @@ -100,7 +100,7 @@ class BuildWorkfile: List[Dict[str, Any]]: Loaded containers during build. """ - from openpype.pipeline.context_tools import ( + from ayon_core.pipeline.context_tools import ( get_current_project_name, get_current_asset_name, get_current_task_name, @@ -240,7 +240,7 @@ class BuildWorkfile: Dict[str, Any]: preset per entered task name """ - from openpype.pipeline.context_tools import ( + from ayon_core.pipeline.context_tools import ( get_current_host_name, get_current_project_name, ) @@ -660,7 +660,7 @@ class BuildWorkfile: ``` """ - from openpype.pipeline.context_tools import get_current_project_name + from ayon_core.pipeline.context_tools import get_current_project_name output = {} if not asset_docs: diff --git a/client/ayon_core/pipeline/workfile/lock_workfile.py b/client/ayon_core/pipeline/workfile/lock_workfile.py index 579840c07d..de9aab292c 100644 --- a/client/ayon_core/pipeline/workfile/lock_workfile.py +++ b/client/ayon_core/pipeline/workfile/lock_workfile.py @@ -1,9 +1,9 @@ import os import json -from openpype.lib import Logger, filter_profiles -from openpype.lib.pype_info import get_workstation_info -from openpype.settings import get_project_settings -from openpype.pipeline import get_process_id +from ayon_core.lib import Logger, filter_profiles +from ayon_core.lib.pype_info import get_workstation_info +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import get_process_id def _read_lock_file(lock_filepath): diff --git a/client/ayon_core/pipeline/workfile/path_resolving.py b/client/ayon_core/pipeline/workfile/path_resolving.py index 78acee20da..95a0a03c60 100644 --- a/client/ayon_core/pipeline/workfile/path_resolving.py +++ b/client/ayon_core/pipeline/workfile/path_resolving.py @@ -3,15 +3,15 @@ import re import copy import platform -from openpype.client import get_project, get_asset_by_name -from openpype.settings import get_project_settings -from openpype.lib import ( +from ayon_core.client import get_project, get_asset_by_name +from ayon_core.settings import get_project_settings +from ayon_core.lib import ( filter_profiles, Logger, StringTemplate, ) -from openpype.pipeline import version_start, Anatomy -from openpype.pipeline.template_data import get_template_data +from ayon_core.pipeline import version_start, Anatomy +from ayon_core.pipeline.template_data import get_template_data def get_workfile_template_key_from_context( diff --git a/client/ayon_core/pipeline/workfile/workfile_template_builder.py b/client/ayon_core/pipeline/workfile/workfile_template_builder.py index 3096d22518..244ab072fa 100644 --- a/client/ayon_core/pipeline/workfile/workfile_template_builder.py +++ b/client/ayon_core/pipeline/workfile/workfile_template_builder.py @@ -19,32 +19,32 @@ from abc import ABCMeta, abstractmethod import six -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_asset_by_name, get_linked_assets, get_representations, ) -from openpype.settings import ( +from ayon_core.settings import ( get_project_settings, get_system_settings, ) -from openpype.host import IWorkfileHost, HostBase -from openpype.lib import ( +from ayon_core.host import IWorkfileHost, HostBase +from ayon_core.lib import ( Logger, StringTemplate, filter_profiles, attribute_definitions, ) -from openpype.lib.attribute_definitions import get_attributes_keys -from openpype.pipeline import Anatomy -from openpype.pipeline.load import ( +from ayon_core.lib.attribute_definitions import get_attributes_keys +from ayon_core.pipeline import Anatomy +from ayon_core.pipeline.load import ( get_loaders_by_name, get_contexts_for_repre_docs, load_with_repre_context, ) -from openpype.pipeline.create import ( +from ayon_core.pipeline.create import ( discover_legacy_creator_plugins, CreateContext, ) @@ -1478,7 +1478,7 @@ class PlaceholderLoadMixin(object): """ from ayon_api.graphql_queries import folders_graphql_query - from openpype.client import get_ayon_server_api_connection + from ayon_core.client import get_ayon_server_api_connection query = folders_graphql_query({"id"}) diff --git a/client/ayon_core/plugins/actions/open_file_explorer.py b/client/ayon_core/plugins/actions/open_file_explorer.py index 1568c41fbd..b29ed30258 100644 --- a/client/ayon_core/plugins/actions/open_file_explorer.py +++ b/client/ayon_core/plugins/actions/open_file_explorer.py @@ -3,15 +3,15 @@ import platform import subprocess from string import Formatter -from openpype.client import ( +from ayon_core.client import ( get_project, get_asset_by_name, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( Anatomy, LauncherAction, ) -from openpype.pipeline.template_data import get_template_data +from ayon_core.pipeline.template_data import get_template_data class OpenTaskPath(LauncherAction): diff --git a/client/ayon_core/plugins/inventory/remove_and_load.py b/client/ayon_core/plugins/inventory/remove_and_load.py index ae66b95f6e..5529090b42 100644 --- a/client/ayon_core/plugins/inventory/remove_and_load.py +++ b/client/ayon_core/plugins/inventory/remove_and_load.py @@ -1,12 +1,12 @@ -from openpype.pipeline import InventoryAction -from openpype.pipeline import get_current_project_name -from openpype.pipeline.load.plugins import discover_loader_plugins -from openpype.pipeline.load.utils import ( +from ayon_core.pipeline import InventoryAction +from ayon_core.pipeline import get_current_project_name +from ayon_core.pipeline.load.plugins import discover_loader_plugins +from ayon_core.pipeline.load.utils import ( get_loader_identifier, remove_container, load_container, ) -from openpype.client import get_representation_by_id +from ayon_core.client import get_representation_by_id class RemoveAndLoad(InventoryAction): diff --git a/client/ayon_core/plugins/load/copy_file.py b/client/ayon_core/plugins/load/copy_file.py index 7fd56c8a6a..0da22826f0 100644 --- a/client/ayon_core/plugins/load/copy_file.py +++ b/client/ayon_core/plugins/load/copy_file.py @@ -1,5 +1,5 @@ -from openpype.style import get_default_entity_icon_color -from openpype.pipeline import load +from ayon_core.style import get_default_entity_icon_color +from ayon_core.pipeline import load class CopyFile(load.LoaderPlugin): diff --git a/client/ayon_core/plugins/load/copy_file_path.py b/client/ayon_core/plugins/load/copy_file_path.py index b055494e85..c3478c32f3 100644 --- a/client/ayon_core/plugins/load/copy_file_path.py +++ b/client/ayon_core/plugins/load/copy_file_path.py @@ -1,6 +1,6 @@ import os -from openpype.pipeline import load +from ayon_core.pipeline import load class CopyFilePath(load.LoaderPlugin): diff --git a/client/ayon_core/plugins/load/delete_old_versions.py b/client/ayon_core/plugins/load/delete_old_versions.py index c7ad88a924..834e9f03fc 100644 --- a/client/ayon_core/plugins/load/delete_old_versions.py +++ b/client/ayon_core/plugins/load/delete_old_versions.py @@ -7,12 +7,12 @@ from pymongo import UpdateOne import qargparse from qtpy import QtWidgets, QtCore -from openpype import style -from openpype.client import get_versions, get_representations -from openpype.modules import ModulesManager -from openpype.lib import format_file_size -from openpype.pipeline import load, AvalonMongoDB, Anatomy -from openpype.pipeline.load import ( +from ayon_core import style +from ayon_core.client import get_versions, get_representations +from ayon_core.modules import ModulesManager +from ayon_core.lib import format_file_size +from ayon_core.pipeline import load, AvalonMongoDB, Anatomy +from ayon_core.pipeline.load import ( get_representation_path_with_anatomy, InvalidRepresentationContext, ) diff --git a/client/ayon_core/plugins/load/delivery.py b/client/ayon_core/plugins/load/delivery.py index 3b493989bd..1a1ac9e0fa 100644 --- a/client/ayon_core/plugins/load/delivery.py +++ b/client/ayon_core/plugins/load/delivery.py @@ -4,17 +4,17 @@ from collections import defaultdict from qtpy import QtWidgets, QtCore, QtGui -from openpype.client import get_representations -from openpype.pipeline import load, Anatomy -from openpype import resources, style +from ayon_core.client import get_representations +from ayon_core.pipeline import load, Anatomy +from ayon_core import resources, style -from openpype.lib import ( +from ayon_core.lib import ( format_file_size, collect_frames, get_datetime_data, ) -from openpype.pipeline.load import get_representation_path_with_anatomy -from openpype.pipeline.delivery import ( +from ayon_core.pipeline.load import get_representation_path_with_anatomy +from ayon_core.pipeline.delivery import ( get_format_dict, check_destination_path, deliver_single_file, diff --git a/client/ayon_core/plugins/load/open_djv.py b/client/ayon_core/plugins/load/open_djv.py index 5c679f6a51..70352c2435 100644 --- a/client/ayon_core/plugins/load/open_djv.py +++ b/client/ayon_core/plugins/load/open_djv.py @@ -1,6 +1,6 @@ import os -from openpype.lib import ApplicationManager -from openpype.pipeline import load +from ayon_core.lib import ApplicationManager +from ayon_core.pipeline import load def existing_djv_path(): diff --git a/client/ayon_core/plugins/load/open_file.py b/client/ayon_core/plugins/load/open_file.py index 5c4f4901d1..5ae5959102 100644 --- a/client/ayon_core/plugins/load/open_file.py +++ b/client/ayon_core/plugins/load/open_file.py @@ -2,7 +2,7 @@ import sys import os import subprocess -from openpype.pipeline import load +from ayon_core.pipeline import load def open(filepath): diff --git a/client/ayon_core/plugins/load/push_to_library.py b/client/ayon_core/plugins/load/push_to_library.py index 5befc5eb9d..421a1e0c37 100644 --- a/client/ayon_core/plugins/load/push_to_library.py +++ b/client/ayon_core/plugins/load/push_to_library.py @@ -1,9 +1,9 @@ import os -from openpype import PACKAGE_DIR, AYON_SERVER_ENABLED -from openpype.lib import get_openpype_execute_args, run_detached_process -from openpype.pipeline import load -from openpype.pipeline.load import LoadError +from ayon_core import AYON_CORE_ROOT, AYON_SERVER_ENABLED +from ayon_core.lib import get_openpype_execute_args, run_detached_process +from ayon_core.pipeline import load +from ayon_core.pipeline.load import LoadError class PushToLibraryProject(load.SubsetLoaderPlugin): @@ -35,14 +35,14 @@ class PushToLibraryProject(load.SubsetLoaderPlugin): if AYON_SERVER_ENABLED: push_tool_script_path = os.path.join( - PACKAGE_DIR, + AYON_CORE_ROOT, "tools", "ayon_push_to_project", "main.py" ) else: push_tool_script_path = os.path.join( - PACKAGE_DIR, + AYON_CORE_ROOT, "tools", "push_to_project", "app.py" diff --git a/client/ayon_core/plugins/publish/cleanup.py b/client/ayon_core/plugins/publish/cleanup.py index 6c122ddf09..050b6f3186 100644 --- a/client/ayon_core/plugins/publish/cleanup.py +++ b/client/ayon_core/plugins/publish/cleanup.py @@ -5,7 +5,7 @@ import shutil import pyblish.api import re -from openpype.tests.lib import is_in_tests +from ayon_core.tests.lib import is_in_tests class CleanUp(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/plugins/publish/collect_anatomy_context_data.py b/client/ayon_core/plugins/publish/collect_anatomy_context_data.py index 508b01447b..978ae5e1e1 100644 --- a/client/ayon_core/plugins/publish/collect_anatomy_context_data.py +++ b/client/ayon_core/plugins/publish/collect_anatomy_context_data.py @@ -15,7 +15,7 @@ Provides: import json import pyblish.api -from openpype.pipeline.template_data import get_template_data +from ayon_core.pipeline.template_data import get_template_data class CollectAnatomyContextData(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py b/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py index b1b7ecd138..18527dcceb 100644 --- a/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py +++ b/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py @@ -27,13 +27,13 @@ import collections import pyblish.api -from openpype.client import ( +from ayon_core.client import ( get_assets, get_subsets, get_last_versions, get_asset_name_identifier, ) -from openpype.pipeline.version_start import get_versioning_start +from ayon_core.pipeline.version_start import get_versioning_start class CollectAnatomyInstanceData(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_anatomy_object.py b/client/ayon_core/plugins/publish/collect_anatomy_object.py index f792cf3abd..6b3549b13f 100644 --- a/client/ayon_core/plugins/publish/collect_anatomy_object.py +++ b/client/ayon_core/plugins/publish/collect_anatomy_object.py @@ -8,7 +8,7 @@ Provides: """ import pyblish.api -from openpype.pipeline import Anatomy, KnownPublishError +from ayon_core.pipeline import Anatomy, KnownPublishError class CollectAnatomyObject(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_audio.py b/client/ayon_core/plugins/publish/collect_audio.py index 734a625852..5091000c11 100644 --- a/client/ayon_core/plugins/publish/collect_audio.py +++ b/client/ayon_core/plugins/publish/collect_audio.py @@ -1,14 +1,14 @@ import collections import pyblish.api -from openpype.client import ( +from ayon_core.client import ( get_assets, get_subsets, get_last_versions, get_representations, get_asset_name_identifier, ) -from openpype.pipeline.load import get_representation_path_with_anatomy +from ayon_core.pipeline.load import get_representation_path_with_anatomy class CollectAudio(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_comment.py b/client/ayon_core/plugins/publish/collect_comment.py index 38d61a7071..4db4827905 100644 --- a/client/ayon_core/plugins/publish/collect_comment.py +++ b/client/ayon_core/plugins/publish/collect_comment.py @@ -24,8 +24,8 @@ Todos: """ import pyblish.api -from openpype.lib.attribute_definitions import TextDef -from openpype.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.lib.attribute_definitions import TextDef +from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin class CollectInstanceCommentDef( diff --git a/client/ayon_core/plugins/publish/collect_context_entities.py b/client/ayon_core/plugins/publish/collect_context_entities.py index 312f5f0eb5..8480435e21 100644 --- a/client/ayon_core/plugins/publish/collect_context_entities.py +++ b/client/ayon_core/plugins/publish/collect_context_entities.py @@ -14,8 +14,8 @@ Provides: import pyblish.api -from openpype.client import get_project, get_asset_by_name -from openpype.pipeline import KnownPublishError +from ayon_core.client import get_project, get_asset_by_name +from ayon_core.pipeline import KnownPublishError class CollectContextEntities(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_current_context.py b/client/ayon_core/plugins/publish/collect_current_context.py index 8b12a3f77f..90b9fcdcbd 100644 --- a/client/ayon_core/plugins/publish/collect_current_context.py +++ b/client/ayon_core/plugins/publish/collect_current_context.py @@ -6,7 +6,7 @@ Provides: """ import pyblish.api -from openpype.pipeline import get_current_context +from ayon_core.pipeline import get_current_context class CollectCurrentContext(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_current_pype_user.py b/client/ayon_core/plugins/publish/collect_current_pype_user.py index 5c0c4fc82e..a73c4e87f9 100644 --- a/client/ayon_core/plugins/publish/collect_current_pype_user.py +++ b/client/ayon_core/plugins/publish/collect_current_pype_user.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.lib import get_openpype_username +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.lib import get_openpype_username class CollectCurrentUserPype(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_custom_staging_dir.py b/client/ayon_core/plugins/publish/collect_custom_staging_dir.py index 669c4873e0..6840c8e416 100644 --- a/client/ayon_core/plugins/publish/collect_custom_staging_dir.py +++ b/client/ayon_core/plugins/publish/collect_custom_staging_dir.py @@ -12,7 +12,7 @@ import os.path import pyblish.api -from openpype.pipeline.publish.lib import get_custom_staging_dir_info +from ayon_core.pipeline.publish.lib import get_custom_staging_dir_info class CollectCustomStagingDir(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/plugins/publish/collect_datetime_data.py b/client/ayon_core/plugins/publish/collect_datetime_data.py index b3178ca3d2..a61fb9a174 100644 --- a/client/ayon_core/plugins/publish/collect_datetime_data.py +++ b/client/ayon_core/plugins/publish/collect_datetime_data.py @@ -5,7 +5,7 @@ Provides: """ import pyblish.api -from openpype.lib.dateutils import get_datetime_data +from ayon_core.lib.dateutils import get_datetime_data class CollectDateTimeData(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_frames_fix.py b/client/ayon_core/plugins/publish/collect_frames_fix.py index 86e727b053..5ea2d52b00 100644 --- a/client/ayon_core/plugins/publish/collect_frames_fix.py +++ b/client/ayon_core/plugins/publish/collect_frames_fix.py @@ -1,11 +1,11 @@ import pyblish.api -from openpype.lib.attribute_definitions import ( +from ayon_core.lib.attribute_definitions import ( TextDef, BoolDef ) -from openpype.pipeline.publish import OpenPypePyblishPluginMixin -from openpype.client.entities import ( +from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.client.entities import ( get_last_version_by_subset_name, get_representations ) diff --git a/client/ayon_core/plugins/publish/collect_from_create_context.py b/client/ayon_core/plugins/publish/collect_from_create_context.py index 84f6141069..9554667d88 100644 --- a/client/ayon_core/plugins/publish/collect_from_create_context.py +++ b/client/ayon_core/plugins/publish/collect_from_create_context.py @@ -4,10 +4,10 @@ import os import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.host import IPublishHost -from openpype.pipeline import legacy_io, registered_host -from openpype.pipeline.create import CreateContext +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.host import IPublishHost +from ayon_core.pipeline import legacy_io, registered_host +from ayon_core.pipeline.create import CreateContext class CollectFromCreateContext(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_host_name.py b/client/ayon_core/plugins/publish/collect_host_name.py index d64af4d049..89e4e03c1a 100644 --- a/client/ayon_core/plugins/publish/collect_host_name.py +++ b/client/ayon_core/plugins/publish/collect_host_name.py @@ -7,7 +7,7 @@ Provides: import os import pyblish.api -from openpype.lib import ApplicationManager +from ayon_core.lib import ApplicationManager class CollectHostName(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_input_representations_to_versions.py b/client/ayon_core/plugins/publish/collect_input_representations_to_versions.py index 2b8c745d3d..b5c9872e74 100644 --- a/client/ayon_core/plugins/publish/collect_input_representations_to_versions.py +++ b/client/ayon_core/plugins/publish/collect_input_representations_to_versions.py @@ -2,7 +2,7 @@ import pyblish.api from bson.objectid import ObjectId -from openpype.client import get_representations +from ayon_core.client import get_representations class CollectInputRepresentationsToVersions(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_modules.py b/client/ayon_core/plugins/publish/collect_modules.py index d76096bcd9..6cb7792ad5 100644 --- a/client/ayon_core/plugins/publish/collect_modules.py +++ b/client/ayon_core/plugins/publish/collect_modules.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Collect OpenPype modules.""" -from openpype.modules import ModulesManager +from ayon_core.modules import ModulesManager import pyblish.api diff --git a/client/ayon_core/plugins/publish/collect_otio_frame_ranges.py b/client/ayon_core/plugins/publish/collect_otio_frame_ranges.py index 4b130b0e03..d1c8d03212 100644 --- a/client/ayon_core/plugins/publish/collect_otio_frame_ranges.py +++ b/client/ayon_core/plugins/publish/collect_otio_frame_ranges.py @@ -23,7 +23,7 @@ class CollectOtioFrameRanges(pyblish.api.InstancePlugin): def process(self, instance): # Not all hosts can import these modules. import opentimelineio as otio - from openpype.pipeline.editorial import ( + from ayon_core.pipeline.editorial import ( get_media_range_with_retimes, otio_range_to_frame_range, otio_range_with_handles diff --git a/client/ayon_core/plugins/publish/collect_otio_subset_resources.py b/client/ayon_core/plugins/publish/collect_otio_subset_resources.py index 739f5bb726..e6817a4beb 100644 --- a/client/ayon_core/plugins/publish/collect_otio_subset_resources.py +++ b/client/ayon_core/plugins/publish/collect_otio_subset_resources.py @@ -10,7 +10,7 @@ import os import clique import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( get_publish_template_name ) @@ -26,7 +26,7 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): def process(self, instance): # Not all hosts can import these modules. import opentimelineio as otio - from openpype.pipeline.editorial import ( + from ayon_core.pipeline.editorial import ( get_media_range_with_retimes, range_from_frames, make_sequence_collection diff --git a/client/ayon_core/plugins/publish/collect_rendered_files.py b/client/ayon_core/plugins/publish/collect_rendered_files.py index baaf454a11..fad0ca27a8 100644 --- a/client/ayon_core/plugins/publish/collect_rendered_files.py +++ b/client/ayon_core/plugins/publish/collect_rendered_files.py @@ -12,8 +12,8 @@ import json import pyblish.api -from openpype.pipeline import legacy_io, KnownPublishError -from openpype.pipeline.publish.lib import add_repre_files_for_cleanup +from ayon_core.pipeline import legacy_io, KnownPublishError +from ayon_core.pipeline.publish.lib import add_repre_files_for_cleanup class CollectRenderedFiles(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py b/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py index 627d451f58..397a3ce87c 100644 --- a/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py +++ b/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype.client import get_representations -from openpype.pipeline import registered_host +from ayon_core.client import get_representations +from ayon_core.pipeline import registered_host class CollectSceneLoadedVersions(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_scene_version.py b/client/ayon_core/plugins/publish/collect_scene_version.py index f870ae9ad7..254d3c913d 100644 --- a/client/ayon_core/plugins/publish/collect_scene_version.py +++ b/client/ayon_core/plugins/publish/collect_scene_version.py @@ -1,9 +1,9 @@ import os import pyblish.api -from openpype.lib import get_version_from_path -from openpype.tests.lib import is_in_tests -from openpype.pipeline import KnownPublishError +from ayon_core.lib import get_version_from_path +from ayon_core.tests.lib import is_in_tests +from ayon_core.pipeline import KnownPublishError class CollectSceneVersion(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/collect_settings.py b/client/ayon_core/plugins/publish/collect_settings.py index a418a6400c..4e3331209d 100644 --- a/client/ayon_core/plugins/publish/collect_settings.py +++ b/client/ayon_core/plugins/publish/collect_settings.py @@ -1,5 +1,5 @@ from pyblish import api -from openpype.settings import ( +from ayon_core.settings import ( get_current_project_settings, get_system_settings, ) diff --git a/client/ayon_core/plugins/publish/collect_time.py b/client/ayon_core/plugins/publish/collect_time.py index 7a005cc9cb..175f7f4676 100644 --- a/client/ayon_core/plugins/publish/collect_time.py +++ b/client/ayon_core/plugins/publish/collect_time.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.lib import get_formatted_current_time +from ayon_core.lib import get_formatted_current_time class CollectTime(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/extract_burnin.py b/client/ayon_core/plugins/publish/extract_burnin.py index 56d45e477b..730dbda550 100644 --- a/client/ayon_core/plugins/publish/extract_burnin.py +++ b/client/ayon_core/plugins/publish/extract_burnin.py @@ -9,17 +9,17 @@ import clique import six import pyblish.api -from openpype import resources, PACKAGE_DIR -from openpype.pipeline import publish -from openpype.lib import ( +from ayon_core import resources, AYON_CORE_ROOT +from ayon_core.pipeline import publish +from ayon_core.lib import ( run_openpype_process, get_transcode_temp_directory, convert_input_paths_for_ffmpeg, should_convert_for_ffmpeg ) -from openpype.lib.profiles_filtering import filter_profiles -from openpype.pipeline.publish.lib import add_repre_files_for_cleanup +from ayon_core.lib.profiles_filtering import filter_profiles +from ayon_core.pipeline.publish.lib import add_repre_files_for_cleanup class ExtractBurnin(publish.Extractor): @@ -809,7 +809,7 @@ class ExtractBurnin(publish.Extractor): """Return path to python script for burnin processing.""" scriptpath = os.path.normpath( os.path.join( - PACKAGE_DIR, + AYON_CORE_ROOT, "scripts", "otio_burnin.py" ) diff --git a/client/ayon_core/plugins/publish/extract_color_transcode.py b/client/ayon_core/plugins/publish/extract_color_transcode.py index 922df469fe..66ba8ad2be 100644 --- a/client/ayon_core/plugins/publish/extract_color_transcode.py +++ b/client/ayon_core/plugins/publish/extract_color_transcode.py @@ -3,18 +3,18 @@ import copy import clique import pyblish.api -from openpype.pipeline import publish -from openpype.lib import ( +from ayon_core.pipeline import publish +from ayon_core.lib import ( is_oiio_supported, ) -from openpype.lib.transcoding import ( +from ayon_core.lib.transcoding import ( convert_colorspace, get_transcode_temp_directory, ) -from openpype.lib.profiles_filtering import filter_profiles +from ayon_core.lib.profiles_filtering import filter_profiles class ExtractOIIOTranscode(publish.Extractor): diff --git a/client/ayon_core/plugins/publish/extract_colorspace_data.py b/client/ayon_core/plugins/publish/extract_colorspace_data.py index 8873dcd637..7da4890748 100644 --- a/client/ayon_core/plugins/publish/extract_colorspace_data.py +++ b/client/ayon_core/plugins/publish/extract_colorspace_data.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractColorspaceData(publish.Extractor, diff --git a/client/ayon_core/plugins/publish/extract_hierarchy_avalon.py b/client/ayon_core/plugins/publish/extract_hierarchy_avalon.py index d70f0cbdd7..38a1920385 100644 --- a/client/ayon_core/plugins/publish/extract_hierarchy_avalon.py +++ b/client/ayon_core/plugins/publish/extract_hierarchy_avalon.py @@ -1,12 +1,12 @@ import collections from copy import deepcopy import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_assets, get_archived_assets ) -from openpype.pipeline import legacy_io +from ayon_core.pipeline import legacy_io class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/extract_hierarchy_to_ayon.py b/client/ayon_core/plugins/publish/extract_hierarchy_to_ayon.py index 9e84daca30..140a9be03d 100644 --- a/client/ayon_core/plugins/publish/extract_hierarchy_to_ayon.py +++ b/client/ayon_core/plugins/publish/extract_hierarchy_to_ayon.py @@ -7,9 +7,9 @@ import pyblish.api from ayon_api import slugify_string from ayon_api.entity_hub import EntityHub -from openpype import AYON_SERVER_ENABLED -from openpype.client import get_assets, get_asset_name_identifier -from openpype.pipeline.template_data import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import get_assets, get_asset_name_identifier +from ayon_core.pipeline.template_data import ( get_asset_template_data, get_task_template_data, ) diff --git a/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py b/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py index d5ab1d6032..c6bdb59f59 100644 --- a/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py +++ b/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py @@ -3,7 +3,7 @@ import tempfile import pyblish -from openpype.lib import ( +from ayon_core.lib import ( get_ffmpeg_tool_args, run_subprocess ) diff --git a/client/ayon_core/plugins/publish/extract_otio_file.py b/client/ayon_core/plugins/publish/extract_otio_file.py index 7f1cac33d7..149f90482a 100644 --- a/client/ayon_core/plugins/publish/extract_otio_file.py +++ b/client/ayon_core/plugins/publish/extract_otio_file.py @@ -2,7 +2,7 @@ import os import pyblish.api -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractOTIOFile(publish.Extractor): diff --git a/client/ayon_core/plugins/publish/extract_otio_review.py b/client/ayon_core/plugins/publish/extract_otio_review.py index ad4c807091..be365520c7 100644 --- a/client/ayon_core/plugins/publish/extract_otio_review.py +++ b/client/ayon_core/plugins/publish/extract_otio_review.py @@ -19,11 +19,11 @@ import os import clique from pyblish import api -from openpype.lib import ( +from ayon_core.lib import ( get_ffmpeg_tool_args, run_subprocess, ) -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractOTIOReview(publish.Extractor): @@ -57,7 +57,7 @@ class ExtractOTIOReview(publish.Extractor): def process(self, instance): # Not all hosts can import these modules. import opentimelineio as otio - from openpype.pipeline.editorial import ( + from ayon_core.pipeline.editorial import ( otio_range_to_frame_range, make_sequence_collection ) @@ -282,7 +282,7 @@ class ExtractOTIOReview(publish.Extractor): otio.time.TimeRange: trimmed available range """ # Not all hosts can import these modules. - from openpype.pipeline.editorial import ( + from ayon_core.pipeline.editorial import ( trim_media_range, range_from_frames ) @@ -345,7 +345,7 @@ class ExtractOTIOReview(publish.Extractor): otio.time.TimeRange: trimmed available range """ # Not all hosts can import this module. - from openpype.pipeline.editorial import frames_to_seconds + from ayon_core.pipeline.editorial import frames_to_seconds # create path and frame start to destination output_path, out_frame_start = self._get_ffmpeg_output() diff --git a/client/ayon_core/plugins/publish/extract_otio_trimming_video.py b/client/ayon_core/plugins/publish/extract_otio_trimming_video.py index 2020fcde93..9736c30b73 100644 --- a/client/ayon_core/plugins/publish/extract_otio_trimming_video.py +++ b/client/ayon_core/plugins/publish/extract_otio_trimming_video.py @@ -10,11 +10,11 @@ from copy import deepcopy import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( get_ffmpeg_tool_args, run_subprocess, ) -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractOTIOTrimmingVideo(publish.Extractor): @@ -75,7 +75,7 @@ class ExtractOTIOTrimmingVideo(publish.Extractor): """ # Not all hosts can import this module. - from openpype.pipeline.editorial import frames_to_seconds + from ayon_core.pipeline.editorial import frames_to_seconds # create path to destination output_path = self._get_ffmpeg_output(input_file_path) diff --git a/client/ayon_core/plugins/publish/extract_review.py b/client/ayon_core/plugins/publish/extract_review.py index 8448c45e70..e349366034 100644 --- a/client/ayon_core/plugins/publish/extract_review.py +++ b/client/ayon_core/plugins/publish/extract_review.py @@ -11,13 +11,13 @@ import clique import speedcopy import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( get_ffmpeg_tool_args, filter_profiles, path_to_subprocess_arg, run_subprocess, ) -from openpype.lib.transcoding import ( +from ayon_core.lib.transcoding import ( IMAGE_EXTENSIONS, get_ffprobe_streams, should_convert_for_ffmpeg, @@ -25,11 +25,11 @@ from openpype.lib.transcoding import ( convert_input_paths_for_ffmpeg, get_transcode_temp_directory, ) -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( KnownPublishError, get_publish_instance_label, ) -from openpype.pipeline.publish.lib import add_repre_files_for_cleanup +from ayon_core.pipeline.publish.lib import add_repre_files_for_cleanup class ExtractReview(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/plugins/publish/extract_review_slate.py b/client/ayon_core/plugins/publish/extract_review_slate.py index 4e3406d3f9..35f55e275c 100644 --- a/client/ayon_core/plugins/publish/extract_review_slate.py +++ b/client/ayon_core/plugins/publish/extract_review_slate.py @@ -5,7 +5,7 @@ from pprint import pformat import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( path_to_subprocess_arg, run_subprocess, get_ffmpeg_tool_args, @@ -14,8 +14,8 @@ from openpype.lib import ( get_ffmpeg_codec_args, get_ffmpeg_format_args, ) -from openpype.pipeline import publish -from openpype.pipeline.publish import KnownPublishError +from ayon_core.pipeline import publish +from ayon_core.pipeline.publish import KnownPublishError class ExtractReviewSlate(publish.Extractor): diff --git a/client/ayon_core/plugins/publish/extract_scanline_exr.py b/client/ayon_core/plugins/publish/extract_scanline_exr.py index 747155689b..07cc0882e0 100644 --- a/client/ayon_core/plugins/publish/extract_scanline_exr.py +++ b/client/ayon_core/plugins/publish/extract_scanline_exr.py @@ -5,12 +5,12 @@ import shutil import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( run_subprocess, get_oiio_tool_args, ToolNotFoundError, ) -from openpype.pipeline import KnownPublishError +from ayon_core.pipeline import KnownPublishError class ExtractScanlineExr(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/plugins/publish/extract_thumbnail.py b/client/ayon_core/plugins/publish/extract_thumbnail.py index 10eb261482..90e0ef7431 100644 --- a/client/ayon_core/plugins/publish/extract_thumbnail.py +++ b/client/ayon_core/plugins/publish/extract_thumbnail.py @@ -4,7 +4,7 @@ import subprocess import tempfile import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( get_ffmpeg_tool_args, get_ffprobe_data, @@ -14,9 +14,9 @@ from openpype.lib import ( path_to_subprocess_arg, run_subprocess, ) -from openpype.lib.transcoding import convert_colorspace +from ayon_core.lib.transcoding import convert_colorspace -from openpype.lib.transcoding import VIDEO_EXTENSIONS +from ayon_core.lib.transcoding import VIDEO_EXTENSIONS class ExtractThumbnail(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/plugins/publish/extract_thumbnail_from_source.py b/client/ayon_core/plugins/publish/extract_thumbnail_from_source.py index 33cbf6d9bf..8d043d700d 100644 --- a/client/ayon_core/plugins/publish/extract_thumbnail_from_source.py +++ b/client/ayon_core/plugins/publish/extract_thumbnail_from_source.py @@ -16,7 +16,7 @@ import os import tempfile import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( get_ffmpeg_tool_args, get_oiio_tool_args, is_oiio_supported, diff --git a/client/ayon_core/plugins/publish/extract_trim_video_audio.py b/client/ayon_core/plugins/publish/extract_trim_video_audio.py index 5e00cfc96f..08c9e47a8c 100644 --- a/client/ayon_core/plugins/publish/extract_trim_video_audio.py +++ b/client/ayon_core/plugins/publish/extract_trim_video_audio.py @@ -3,11 +3,11 @@ from pprint import pformat import pyblish.api -from openpype.lib import ( +from ayon_core.lib import ( get_ffmpeg_tool_args, run_subprocess, ) -from openpype.pipeline import publish +from ayon_core.pipeline import publish class ExtractTrimVideoAudio(publish.Extractor): diff --git a/client/ayon_core/plugins/publish/integrate.py b/client/ayon_core/plugins/publish/integrate.py index 581c0c012f..713207505c 100644 --- a/client/ayon_core/plugins/publish/integrate.py +++ b/client/ayon_core/plugins/publish/integrate.py @@ -9,7 +9,7 @@ import six from bson.objectid import ObjectId import pyblish.api -from openpype.client.operations import ( +from ayon_core.client.operations import ( OperationsSession, new_subset_document, new_version_doc, @@ -19,17 +19,17 @@ from openpype.client.operations import ( prepare_representation_update_data, ) -from openpype.client import ( +from ayon_core.client import ( get_representations, get_subset_by_name, get_version_by_name, ) -from openpype.lib import source_hash -from openpype.lib.file_transaction import ( +from ayon_core.lib import source_hash +from ayon_core.lib.file_transaction import ( FileTransaction, DuplicateDestinationError ) -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( KnownPublishError, get_publish_template_name, ) diff --git a/client/ayon_core/plugins/publish/integrate_hero_version.py b/client/ayon_core/plugins/publish/integrate_hero_version.py index 59dc6b5c64..6b064433bd 100644 --- a/client/ayon_core/plugins/publish/integrate_hero_version.py +++ b/client/ayon_core/plugins/publish/integrate_hero_version.py @@ -6,24 +6,24 @@ import shutil import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_version_by_id, get_hero_version_by_subset_id, get_archived_representations, get_representations, ) -from openpype.client.operations import ( +from ayon_core.client.operations import ( OperationsSession, new_hero_version_doc, prepare_hero_version_update_data, prepare_representation_update_data, ) -from openpype.lib import create_hard_link -from openpype.pipeline import ( +from ayon_core.lib import create_hard_link +from ayon_core.pipeline import ( schema ) -from openpype.pipeline.publish import get_publish_template_name +from ayon_core.pipeline.publish import get_publish_template_name class IntegrateHeroVersion(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/plugins/publish/integrate_inputlinks.py b/client/ayon_core/plugins/publish/integrate_inputlinks.py index 3baa462a81..a44d8ae2b9 100644 --- a/client/ayon_core/plugins/publish/integrate_inputlinks.py +++ b/client/ayon_core/plugins/publish/integrate_inputlinks.py @@ -3,8 +3,8 @@ from collections import OrderedDict from bson.objectid import ObjectId import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline import legacy_io +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline import legacy_io class IntegrateInputLinks(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/integrate_inputlinks_ayon.py b/client/ayon_core/plugins/publish/integrate_inputlinks_ayon.py index 28684aa889..779fb5b3cc 100644 --- a/client/ayon_core/plugins/publish/integrate_inputlinks_ayon.py +++ b/client/ayon_core/plugins/publish/integrate_inputlinks_ayon.py @@ -7,7 +7,7 @@ from ayon_api import ( get_versions_links, ) -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED class IntegrateInputLinksAYON(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/integrate_subset_group.py b/client/ayon_core/plugins/publish/integrate_subset_group.py index a24ebba3a5..ff8ddd9b09 100644 --- a/client/ayon_core/plugins/publish/integrate_subset_group.py +++ b/client/ayon_core/plugins/publish/integrate_subset_group.py @@ -9,8 +9,8 @@ Provides: """ import pyblish.api -from openpype.lib.profiles_filtering import filter_profiles -from openpype.lib import ( +from ayon_core.lib.profiles_filtering import filter_profiles +from ayon_core.lib import ( prepare_template_data, StringTemplate, TemplateUnsolved diff --git a/client/ayon_core/plugins/publish/integrate_thumbnail.py b/client/ayon_core/plugins/publish/integrate_thumbnail.py index b154940469..6ebcde67cd 100644 --- a/client/ayon_core/plugins/publish/integrate_thumbnail.py +++ b/client/ayon_core/plugins/publish/integrate_thumbnail.py @@ -18,10 +18,10 @@ import collections import six import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.client import get_versions -from openpype.client.operations import OperationsSession, new_thumbnail_doc -from openpype.pipeline.publish import get_publish_instance_label +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import get_versions +from ayon_core.client.operations import OperationsSession, new_thumbnail_doc +from ayon_core.pipeline.publish import get_publish_instance_label InstanceFilterResult = collections.namedtuple( "InstanceFilterResult", diff --git a/client/ayon_core/plugins/publish/integrate_thumbnail_ayon.py b/client/ayon_core/plugins/publish/integrate_thumbnail_ayon.py index e56c567667..7941c2e711 100644 --- a/client/ayon_core/plugins/publish/integrate_thumbnail_ayon.py +++ b/client/ayon_core/plugins/publish/integrate_thumbnail_ayon.py @@ -27,9 +27,9 @@ import collections import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.client import get_versions -from openpype.client.operations import OperationsSession +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import get_versions +from ayon_core.client.operations import OperationsSession InstanceFilterResult = collections.namedtuple( "InstanceFilterResult", @@ -171,7 +171,7 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin): version_docs_by_str_id, project_name ): - from openpype.client.server.operations import create_thumbnail + from ayon_core.client.server.operations import create_thumbnail # Make sure each entity id has defined only one thumbnail id thumbnail_info_by_entity_id = {} diff --git a/client/ayon_core/plugins/publish/integrate_version_attrs.py b/client/ayon_core/plugins/publish/integrate_version_attrs.py index ed179ae319..4af6bc2c16 100644 --- a/client/ayon_core/plugins/publish/integrate_version_attrs.py +++ b/client/ayon_core/plugins/publish/integrate_version_attrs.py @@ -1,8 +1,8 @@ import pyblish.api import ayon_api -from openpype import AYON_SERVER_ENABLED -from openpype.client.operations import OperationsSession +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client.operations import OperationsSession class IntegrateVersionAttributes(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py b/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py index 77bf2edba5..fc60948139 100644 --- a/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py +++ b/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py @@ -13,7 +13,7 @@ """ import pyblish.api -from openpype.lib.profiles_filtering import filter_profiles +from ayon_core.lib.profiles_filtering import filter_profiles class PreIntegrateThumbnails(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/plugins/publish/validate_asset_docs.py b/client/ayon_core/plugins/publish/validate_asset_docs.py index 8dfd783c39..22d957f6e2 100644 --- a/client/ayon_core/plugins/publish/validate_asset_docs.py +++ b/client/ayon_core/plugins/publish/validate_asset_docs.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline import PublishValidationError +from ayon_core.pipeline import PublishValidationError class ValidateAssetDocs(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/plugins/publish/validate_containers.py b/client/ayon_core/plugins/publish/validate_containers.py index 8dc0c61cab..bd21ec9693 100644 --- a/client/ayon_core/plugins/publish/validate_containers.py +++ b/client/ayon_core/plugins/publish/validate_containers.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.load import any_outdated_containers -from openpype.pipeline import ( +from ayon_core.pipeline.load import any_outdated_containers +from ayon_core.pipeline import ( PublishXmlValidationError, OptionalPyblishPluginMixin ) @@ -13,7 +13,7 @@ class ShowInventory(pyblish.api.Action): on = "failed" def process(self, context, plugin): - from openpype.tools.utils import host_tools + from ayon_core.tools.utils import host_tools host_tools.show_scene_inventory() diff --git a/client/ayon_core/plugins/publish/validate_editorial_asset_name.py b/client/ayon_core/plugins/publish/validate_editorial_asset_name.py index b5afc49f2e..8f0f86a044 100644 --- a/client/ayon_core/plugins/publish/validate_editorial_asset_name.py +++ b/client/ayon_core/plugins/publish/validate_editorial_asset_name.py @@ -2,7 +2,7 @@ from pprint import pformat import pyblish.api -from openpype.client import get_assets, get_asset_name_identifier +from ayon_core.client import get_assets, get_asset_name_identifier class ValidateEditorialAssetName(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/validate_file_saved.py b/client/ayon_core/plugins/publish/validate_file_saved.py index 94aadc9358..d459ba7ed4 100644 --- a/client/ayon_core/plugins/publish/validate_file_saved.py +++ b/client/ayon_core/plugins/publish/validate_file_saved.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import PublishValidationError +from ayon_core.pipeline.publish import PublishValidationError class ValidateCurrentSaveFile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/validate_filesequences.py b/client/ayon_core/plugins/publish/validate_filesequences.py index 0ac281022d..2e44c98167 100644 --- a/client/ayon_core/plugins/publish/validate_filesequences.py +++ b/client/ayon_core/plugins/publish/validate_filesequences.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import PublishValidationError +from ayon_core.pipeline.publish import PublishValidationError class ValidateFileSequences(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/validate_intent.py b/client/ayon_core/plugins/publish/validate_intent.py index 832c7cc0a1..71df652e92 100644 --- a/client/ayon_core/plugins/publish/validate_intent.py +++ b/client/ayon_core/plugins/publish/validate_intent.py @@ -1,7 +1,7 @@ import pyblish.api -from openpype.lib import filter_profiles -from openpype.pipeline.publish import PublishValidationError +from ayon_core.lib import filter_profiles +from ayon_core.pipeline.publish import PublishValidationError class ValidateIntent(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/plugins/publish/validate_publish_dir.py b/client/ayon_core/plugins/publish/validate_publish_dir.py index 0eb93da583..5827774cca 100644 --- a/client/ayon_core/plugins/publish/validate_publish_dir.py +++ b/client/ayon_core/plugins/publish/validate_publish_dir.py @@ -1,6 +1,6 @@ import pyblish.api -from openpype.pipeline.publish import ValidateContentsOrder -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ValidateContentsOrder +from ayon_core.pipeline.publish import ( PublishXmlValidationError, get_publish_template_name, ) diff --git a/client/ayon_core/plugins/publish/validate_resources.py b/client/ayon_core/plugins/publish/validate_resources.py index 7911c70c2d..74b003cb78 100644 --- a/client/ayon_core/plugins/publish/validate_resources.py +++ b/client/ayon_core/plugins/publish/validate_resources.py @@ -1,6 +1,6 @@ import os import pyblish.api -from openpype.pipeline.publish import ValidateContentsOrder +from ayon_core.pipeline.publish import ValidateContentsOrder class ValidateResources(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/plugins/publish/validate_unique_subsets.py b/client/ayon_core/plugins/publish/validate_unique_subsets.py index 11fb827770..75d12f8e01 100644 --- a/client/ayon_core/plugins/publish/validate_unique_subsets.py +++ b/client/ayon_core/plugins/publish/validate_unique_subsets.py @@ -1,6 +1,6 @@ from collections import defaultdict import pyblish.api -from openpype.pipeline.publish import ( +from ayon_core.pipeline.publish import ( PublishXmlValidationError, ) diff --git a/client/ayon_core/plugins/publish/validate_version.py b/client/ayon_core/plugins/publish/validate_version.py index 84d52fab73..42073e16f6 100644 --- a/client/ayon_core/plugins/publish/validate_version.py +++ b/client/ayon_core/plugins/publish/validate_version.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline.publish import PublishValidationError +from ayon_core.pipeline.publish import PublishValidationError class ValidateVersion(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/pype_commands.py b/client/ayon_core/pype_commands.py index f744337c67..dcc47688b9 100644 --- a/client/ayon_core/pype_commands.py +++ b/client/ayon_core/pype_commands.py @@ -14,8 +14,8 @@ class PypeCommands: """ @staticmethod def launch_tray(): - from openpype.lib import Logger - from openpype.tools import tray + from ayon_core.lib import Logger + from ayon_core.tools import tray Logger.set_process_name("Tray") @@ -23,7 +23,7 @@ class PypeCommands: @staticmethod def launch_settings_gui(dev): - from openpype.tools import settings + from ayon_core.tools import settings # TODO change argument options to allow enum of user roles if dev: @@ -36,8 +36,8 @@ class PypeCommands: def add_modules(click_func): """Modules/Addons can add their cli commands dynamically.""" - from openpype.lib import Logger - from openpype.modules import ModulesManager + from ayon_core.lib import Logger + from ayon_core.modules import ModulesManager manager = ModulesManager() log = Logger.get_logger("CLI-AddModules") @@ -62,13 +62,13 @@ class PypeCommands: @staticmethod def launch_webpublisher_webservercli(*args, **kwargs): - from openpype.hosts.webpublisher.webserver_service import run_webserver + from ayon_core.hosts.webpublisher.webserver_service import run_webserver return run_webserver(*args, **kwargs) @staticmethod def launch_traypublisher(): - from openpype.tools import traypublisher + from ayon_core.tools import traypublisher traypublisher.main() @staticmethod @@ -87,18 +87,18 @@ class PypeCommands: RuntimeError: When there is no path to process. """ - from openpype.lib import Logger - from openpype.lib.applications import ( + from ayon_core.lib import Logger + from ayon_core.lib.applications import ( get_app_environments_for_context, LaunchTypes, ) - from openpype.modules import ModulesManager - from openpype.pipeline import ( + from ayon_core.modules import ModulesManager + from ayon_core.pipeline import ( install_openpype_plugins, get_global_context, ) - from openpype.tools.utils.host_tools import show_publish - from openpype.tools.utils.lib import qt_app_context + from ayon_core.tools.utils.host_tools import show_publish + from ayon_core.tools.utils.lib import qt_app_context # Register target and host import pyblish.api @@ -173,7 +173,7 @@ class PypeCommands: Called by Deadline plugin to propagate environment into render jobs. """ - from openpype.lib.applications import ( + from ayon_core.lib.applications import ( get_app_environments_for_context, LaunchTypes, ) @@ -199,13 +199,13 @@ class PypeCommands: @staticmethod def launch_project_manager(): - from openpype.tools import project_manager + from ayon_core.tools import project_manager project_manager.main() @staticmethod def contextselection(output_path, project_name, asset_name, strict): - from openpype.tools.context_dialog import main + from ayon_core.tools.context_dialog import main main(output_path, project_name, asset_name, strict) @@ -288,13 +288,13 @@ class PypeCommands: def repack_version(self, directory): """Repacking OpenPype version.""" - from openpype.tools.repack_version import VersionRepacker + from ayon_core.tools.repack_version import VersionRepacker version_packer = VersionRepacker(directory) version_packer.process() def pack_project(self, project_name, dirpath, database_only): - from openpype.lib.project_backpack import pack_project + from ayon_core.lib.project_backpack import pack_project if database_only and not dirpath: raise ValueError(( @@ -306,6 +306,6 @@ class PypeCommands: pack_project(project_name, dirpath, database_only) def unpack_project(self, zip_filepath, new_root, database_only): - from openpype.lib.project_backpack import unpack_project + from ayon_core.lib.project_backpack import unpack_project unpack_project(zip_filepath, new_root, database_only) diff --git a/client/ayon_core/resources/__init__.py b/client/ayon_core/resources/__init__.py index c429fb8c3e..c5e5b90f96 100644 --- a/client/ayon_core/resources/__init__.py +++ b/client/ayon_core/resources/__init__.py @@ -1,6 +1,6 @@ import os -from openpype import AYON_SERVER_ENABLED -from openpype.lib.openpype_version import is_staging_enabled +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.lib.openpype_version import is_staging_enabled RESOURCES_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/client/ayon_core/scripts/non_python_host_launch.py b/client/ayon_core/scripts/non_python_host_launch.py index c95a9df314..97632e98ad 100644 --- a/client/ayon_core/scripts/non_python_host_launch.py +++ b/client/ayon_core/scripts/non_python_host_launch.py @@ -15,7 +15,7 @@ CURRENT_FILE = os.path.abspath(__file__) def show_error_messagebox(title, message, detail_message=None): """Function will show message and process ends after closing it.""" from qtpy import QtWidgets, QtCore - from openpype import style + from ayon_core import style app = QtWidgets.QApplication([]) app.setStyleSheet(style.load_stylesheet()) @@ -82,11 +82,11 @@ def main(argv): host_name = os.environ["AVALON_APP"].lower() if host_name == "photoshop": # TODO refactor launch logic according to AE - from openpype.hosts.photoshop.api.lib import main + from ayon_core.hosts.photoshop.api.lib import main elif host_name == "aftereffects": - from openpype.hosts.aftereffects.api.launch_logic import main + from ayon_core.hosts.aftereffects.api.launch_logic import main elif host_name == "harmony": - from openpype.hosts.harmony.api.lib import main + from ayon_core.hosts.harmony.api.lib import main else: title = "Unknown host name" message = ( diff --git a/client/ayon_core/scripts/otio_burnin.py b/client/ayon_core/scripts/otio_burnin.py index 189feaee3a..f12d298ac6 100644 --- a/client/ayon_core/scripts/otio_burnin.py +++ b/client/ayon_core/scripts/otio_burnin.py @@ -7,7 +7,7 @@ import tempfile from string import Formatter import opentimelineio_contrib.adapters.ffmpeg_burnins as ffmpeg_burnins -from openpype.lib import ( +from ayon_core.lib import ( get_ffmpeg_tool_args, get_ffmpeg_codec_args, get_ffmpeg_format_args, diff --git a/client/ayon_core/scripts/remote_publish.py b/client/ayon_core/scripts/remote_publish.py index d362f7abdc..7e7bf2493b 100644 --- a/client/ayon_core/scripts/remote_publish.py +++ b/client/ayon_core/scripts/remote_publish.py @@ -1,6 +1,6 @@ try: - from openpype.lib import Logger - from openpype.pipeline.publish.lib import remote_publish + from ayon_core.lib import Logger + from ayon_core.pipeline.publish.lib import remote_publish except ImportError as exc: # Ensure Deadline fails by output an error that contains "Fatal Error:" raise ImportError("Fatal Error: %s" % exc) diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py index 2c851c054d..e54e831aae 100644 --- a/client/ayon_core/settings/ayon_settings.py +++ b/client/ayon_core/settings/ayon_settings.py @@ -21,7 +21,7 @@ import time import six -from openpype.client import get_ayon_server_api_connection +from ayon_core.client import get_ayon_server_api_connection def _convert_color(color_value): @@ -1454,7 +1454,7 @@ class _AyonSettingsCache: @classmethod def _get_variant(cls): if _AyonSettingsCache.variant is None: - from openpype.lib.openpype_version import is_staging_enabled + from ayon_core.lib.openpype_version import is_staging_enabled variant = "production" if is_dev_mode_enabled(): diff --git a/client/ayon_core/settings/defaults/project_settings/maya.json b/client/ayon_core/settings/defaults/project_settings/maya.json index 615000183d..b2dc0ccd65 100644 --- a/client/ayon_core/settings/defaults/project_settings/maya.json +++ b/client/ayon_core/settings/defaults/project_settings/maya.json @@ -462,7 +462,7 @@ "definition": [ { "type": "action", - "command": "import openpype.hosts.maya.api.commands as op_cmds; op_cmds.edit_shader_definitions()", + "command": "import ayon_core.hosts.maya.api.commands as op_cmds; op_cmds.edit_shader_definitions()", "sourcetype": "python", "title": "Edit shader name definitions", "tooltip": "Edit shader name definitions used in validation and renaming.", diff --git a/client/ayon_core/settings/defaults/project_settings/nuke.json b/client/ayon_core/settings/defaults/project_settings/nuke.json index 15c2d262e0..11b2988c67 100644 --- a/client/ayon_core/settings/defaults/project_settings/nuke.json +++ b/client/ayon_core/settings/defaults/project_settings/nuke.json @@ -219,14 +219,14 @@ "type": "action", "sourcetype": "python", "title": "Set Frame Start (Read Node)", - "command": "from openpype.hosts.nuke.startup.frame_setting_for_read_nodes import main;main();", + "command": "from ayon_core.hosts.nuke.startup.frame_setting_for_read_nodes import main;main();", "tooltip": "Set frame start for read node(s)" }, { "type": "action", "sourcetype": "python", "title": "Set non publish output for Write Node", - "command": "from openpype.hosts.nuke.startup.custom_write_node import main;main();", + "command": "from ayon_core.hosts.nuke.startup.custom_write_node import main;main();", "tooltip": "Open the OpenPype Nuke user doc page" } ] diff --git a/client/ayon_core/settings/entities/base_entity.py b/client/ayon_core/settings/entities/base_entity.py index f28fefdf5a..ec59b97505 100644 --- a/client/ayon_core/settings/entities/base_entity.py +++ b/client/ayon_core/settings/entities/base_entity.py @@ -15,7 +15,7 @@ from .exceptions import ( EntitySchemaError ) -from openpype.lib import Logger +from ayon_core.lib import Logger @six.add_metaclass(ABCMeta) diff --git a/client/ayon_core/settings/entities/dict_conditional.py b/client/ayon_core/settings/entities/dict_conditional.py index f26d86e6df..5891056559 100644 --- a/client/ayon_core/settings/entities/dict_conditional.py +++ b/client/ayon_core/settings/entities/dict_conditional.py @@ -4,7 +4,7 @@ from .lib import ( OverrideState, NOT_SET ) -from openpype.settings.constants import ( +from ayon_core.settings.constants import ( METADATA_KEYS, M_OVERRIDDEN_KEY, KEY_REGEX diff --git a/client/ayon_core/settings/entities/dict_immutable_keys_entity.py b/client/ayon_core/settings/entities/dict_immutable_keys_entity.py index a25c22aa19..b81c239ed4 100644 --- a/client/ayon_core/settings/entities/dict_immutable_keys_entity.py +++ b/client/ayon_core/settings/entities/dict_immutable_keys_entity.py @@ -7,7 +7,7 @@ from .lib import ( NOT_SET, STRING_TYPE ) -from openpype.settings.constants import ( +from ayon_core.settings.constants import ( METADATA_KEYS, M_OVERRIDDEN_KEY, KEY_REGEX diff --git a/client/ayon_core/settings/entities/dict_mutable_keys_entity.py b/client/ayon_core/settings/entities/dict_mutable_keys_entity.py index c11a7cf059..d98497c92f 100644 --- a/client/ayon_core/settings/entities/dict_mutable_keys_entity.py +++ b/client/ayon_core/settings/entities/dict_mutable_keys_entity.py @@ -12,7 +12,7 @@ from .exceptions import ( RequiredKeyModified, EntitySchemaError ) -from openpype.settings.constants import ( +from ayon_core.settings.constants import ( METADATA_KEYS, M_DYNAMIC_KEY_LABEL, KEY_REGEX, diff --git a/client/ayon_core/settings/entities/exceptions.py b/client/ayon_core/settings/entities/exceptions.py index d1728a7b12..5c5003b5da 100644 --- a/client/ayon_core/settings/entities/exceptions.py +++ b/client/ayon_core/settings/entities/exceptions.py @@ -1,4 +1,4 @@ -from openpype.settings.constants import KEY_ALLOWED_SYMBOLS +from ayon_core.settings.constants import KEY_ALLOWED_SYMBOLS class DefaultsNotDefined(Exception): diff --git a/client/ayon_core/settings/entities/input_entities.py b/client/ayon_core/settings/entities/input_entities.py index 2fe2033383..df67220d06 100644 --- a/client/ayon_core/settings/entities/input_entities.py +++ b/client/ayon_core/settings/entities/input_entities.py @@ -15,7 +15,7 @@ from .exceptions import ( EntitySchemaError ) -from openpype.settings.constants import METADATA_KEYS +from ayon_core.settings.constants import METADATA_KEYS class EndpointEntity(ItemEntity): diff --git a/client/ayon_core/settings/entities/lib.py b/client/ayon_core/settings/entities/lib.py index 93abc27b0e..4b02370373 100644 --- a/client/ayon_core/settings/entities/lib.py +++ b/client/ayon_core/settings/entities/lib.py @@ -11,7 +11,7 @@ from .exceptions import ( SchemaDuplicatedEnvGroupKeys ) -from openpype.settings.constants import ( +from ayon_core.settings.constants import ( SYSTEM_SETTINGS_KEY, PROJECT_SETTINGS_KEY, SCHEMA_KEY_SYSTEM_SETTINGS, @@ -145,7 +145,7 @@ class SchemasHub: self._load_schemas() def _load_modules_settings_defs(self): - from openpype.modules import get_module_settings_defs + from ayon_core.modules import get_module_settings_defs module_settings_defs = get_module_settings_defs() for module_settings_def_cls in module_settings_defs: @@ -372,7 +372,7 @@ class SchemasHub: better handling of abstract classes. Skipping them is dangerous. """ - from openpype.settings import entities + from ayon_core.settings import entities # Define known abstract classes known_abstract_classes = ( diff --git a/client/ayon_core/settings/entities/op_version_entity.py b/client/ayon_core/settings/entities/op_version_entity.py index f79048222e..44add2a369 100644 --- a/client/ayon_core/settings/entities/op_version_entity.py +++ b/client/ayon_core/settings/entities/op_version_entity.py @@ -1,4 +1,4 @@ -from openpype.lib.openpype_version import ( +from ayon_core.lib.openpype_version import ( get_remote_versions, get_OpenPypeVersion, get_installed_version diff --git a/client/ayon_core/settings/entities/root_entities.py b/client/ayon_core/settings/entities/root_entities.py index bd617c6b7c..a937c0cc50 100644 --- a/client/ayon_core/settings/entities/root_entities.py +++ b/client/ayon_core/settings/entities/root_entities.py @@ -19,15 +19,15 @@ from .exceptions import ( SchemaError, InvalidKeySymbols ) -from openpype.settings.constants import ( +from ayon_core.settings.constants import ( SYSTEM_SETTINGS_KEY, PROJECT_SETTINGS_KEY, PROJECT_ANATOMY_KEY, KEY_REGEX ) -from openpype.settings.exceptions import SaveWarningExc +from ayon_core.settings.exceptions import SaveWarningExc -from openpype.settings.lib import ( +from ayon_core.settings.lib import ( DEFAULTS_DIR, get_default_settings, diff --git a/client/ayon_core/settings/handlers.py b/client/ayon_core/settings/handlers.py index 671cabfbc2..24ab50d90a 100644 --- a/client/ayon_core/settings/handlers.py +++ b/client/ayon_core/settings/handlers.py @@ -6,13 +6,13 @@ import datetime from abc import ABCMeta, abstractmethod import six -import openpype.version -from openpype.client.mongo import ( +import ayon_core.version +from ayon_core.client.mongo import ( OpenPypeMongoConnection, get_project_connection, ) -from openpype.client.entities import get_project -from openpype.lib.pype_info import get_workstation_info +from ayon_core.client.entities import get_project +from ayon_core.lib.pype_info import get_workstation_info from .constants import ( @@ -77,7 +77,7 @@ class SettingsStateInfo: ): """Create information about this machine for current time.""" - from openpype.lib.pype_info import get_workstation_info + from ayon_core.lib.pype_info import get_workstation_info now = datetime.datetime.now() workstation_info = get_workstation_info() @@ -1075,7 +1075,7 @@ class MongoSettingsHandler(SettingsHandler): return self._version_order_checked = True - from openpype.lib.openpype_version import get_OpenPypeVersion + from ayon_core.lib.openpype_version import get_OpenPypeVersion OpenPypeVersion = get_OpenPypeVersion() # Skip if 'OpenPypeVersion' is not available @@ -1119,7 +1119,7 @@ class MongoSettingsHandler(SettingsHandler): project_name: None for project_name in project_names } - from openpype.lib.openpype_version import get_OpenPypeVersion + from ayon_core.lib.openpype_version import get_OpenPypeVersion OpenPypeVersion = get_OpenPypeVersion() if OpenPypeVersion is None: return output @@ -1619,7 +1619,7 @@ class MongoSettingsHandler(SettingsHandler): if contain_legacy: set_versions.remove(LEGACY_SETTINGS_VERSION) - from openpype.lib.openpype_version import get_OpenPypeVersion + from ayon_core.lib.openpype_version import get_OpenPypeVersion OpenPypeVersion = get_OpenPypeVersion() @@ -1803,7 +1803,7 @@ class MongoLocalSettingsHandler(LocalSettingsHandler): def __init__(self, local_site_id=None): # Get mongo connection - from openpype.lib import get_local_site_id + from ayon_core.lib import get_local_site_id if local_site_id is None: local_site_id = get_local_site_id() diff --git a/client/ayon_core/settings/lib.py b/client/ayon_core/settings/lib.py index d62e50d3c7..8f85e5fbee 100644 --- a/client/ayon_core/settings/lib.py +++ b/client/ayon_core/settings/lib.py @@ -5,7 +5,7 @@ import logging import platform import copy -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED from .exceptions import ( SaveWarningExc @@ -163,7 +163,7 @@ def save_studio_settings(data): SaveWarningExc: If any module raises the exception. """ # Notify Pype modules - from openpype.modules import ModulesManager, ISettingsChangeListener + from ayon_core.modules import ModulesManager, ISettingsChangeListener old_data = get_system_settings() default_values = get_default_settings()[SYSTEM_SETTINGS_KEY] @@ -211,7 +211,7 @@ def save_project_settings(project_name, overrides): SaveWarningExc: If any module raises the exception. """ # Notify Pype modules - from openpype.modules import ModulesManager, ISettingsChangeListener + from ayon_core.modules import ModulesManager, ISettingsChangeListener default_values = get_default_settings()[PROJECT_SETTINGS_KEY] if project_name: @@ -272,7 +272,7 @@ def save_project_anatomy(project_name, anatomy_data): SaveWarningExc: If any module raises the exception. """ # Notify Pype modules - from openpype.modules import ModulesManager, ISettingsChangeListener + from ayon_core.modules import ModulesManager, ISettingsChangeListener default_values = get_default_settings()[PROJECT_ANATOMY_KEY] if project_name: @@ -542,7 +542,7 @@ def reset_default_settings(): def _get_default_settings(): - from openpype.modules import get_module_settings_defs + from ayon_core.modules import get_module_settings_defs defaults = load_openpype_default_settings() diff --git a/client/ayon_core/style/__init__.py b/client/ayon_core/style/__init__.py index 48e943beb1..e65bede6e8 100644 --- a/client/ayon_core/style/__init__.py +++ b/client/ayon_core/style/__init__.py @@ -4,7 +4,7 @@ import json import collections import six -from openpype import resources +from ayon_core import resources from .color_defs import parse_color diff --git a/client/ayon_core/tests/test_avalon_plugin_presets.py b/client/ayon_core/tests/test_avalon_plugin_presets.py index 464c216d6f..4926286ca3 100644 --- a/client/ayon_core/tests/test_avalon_plugin_presets.py +++ b/client/ayon_core/tests/test_avalon_plugin_presets.py @@ -1,4 +1,4 @@ -from openpype.pipeline import ( +from ayon_core.pipeline import ( install_host, LegacyCreator, register_creator_plugin, diff --git a/client/ayon_core/tests/test_lib_restructuralization.py b/client/ayon_core/tests/test_lib_restructuralization.py index a91d65f7a8..ffbd62b045 100644 --- a/client/ayon_core/tests/test_lib_restructuralization.py +++ b/client/ayon_core/tests/test_lib_restructuralization.py @@ -5,21 +5,21 @@ def test_backward_compatibility(printer): printer("Test if imports still work") try: - from openpype.lib import execute_hook - from openpype.lib import PypeHook + from ayon_core.lib import execute_hook + from ayon_core.lib import PypeHook - from openpype.lib import ApplicationLaunchFailed + from ayon_core.lib import ApplicationLaunchFailed - from openpype.lib import get_ffmpeg_tool_path - from openpype.lib import get_last_version_from_path - from openpype.lib import get_paths_from_environ - from openpype.lib import get_version_from_path - from openpype.lib import version_up + from ayon_core.lib import get_ffmpeg_tool_path + from ayon_core.lib import get_last_version_from_path + from ayon_core.lib import get_paths_from_environ + from ayon_core.lib import get_version_from_path + from ayon_core.lib import version_up - from openpype.lib import get_ffprobe_streams + from ayon_core.lib import get_ffprobe_streams - from openpype.lib import source_hash - from openpype.lib import run_subprocess + from ayon_core.lib import source_hash + from ayon_core.lib import run_subprocess except ImportError as e: raise diff --git a/client/ayon_core/tests/test_pyblish_filter.py b/client/ayon_core/tests/test_pyblish_filter.py index b74784145f..bc20f863c9 100644 --- a/client/ayon_core/tests/test_pyblish_filter.py +++ b/client/ayon_core/tests/test_pyblish_filter.py @@ -2,7 +2,7 @@ import os import pyblish.api import pyblish.util import pyblish.plugin -from openpype.pipeline.publish.lib import filter_pyblish_plugins +from ayon_core.pipeline.publish.lib import filter_pyblish_plugins from . import lib diff --git a/client/ayon_core/tools/adobe_webserver/app.py b/client/ayon_core/tools/adobe_webserver/app.py index 49d61d3883..893c076020 100644 --- a/client/ayon_core/tools/adobe_webserver/app.py +++ b/client/ayon_core/tools/adobe_webserver/app.py @@ -16,7 +16,7 @@ from wsrpc_aiohttp import ( WSRPCClient ) -from openpype.pipeline import get_global_context +from ayon_core.pipeline import get_global_context log = logging.getLogger(__name__) diff --git a/client/ayon_core/tools/assetlinks/widgets.py b/client/ayon_core/tools/assetlinks/widgets.py index 7b05eef2d7..7db6243358 100644 --- a/client/ayon_core/tools/assetlinks/widgets.py +++ b/client/ayon_core/tools/assetlinks/widgets.py @@ -1,5 +1,5 @@ import collections -from openpype.client import ( +from ayon_core.client import ( get_versions, get_subsets, get_assets, diff --git a/client/ayon_core/tools/attribute_defs/files_widget.py b/client/ayon_core/tools/attribute_defs/files_widget.py index 076b33fb7c..95091bed5a 100644 --- a/client/ayon_core/tools/attribute_defs/files_widget.py +++ b/client/ayon_core/tools/attribute_defs/files_widget.py @@ -5,14 +5,14 @@ import json from qtpy import QtWidgets, QtCore, QtGui -from openpype.lib import FileDefItem -from openpype.tools.utils import ( +from ayon_core.lib import FileDefItem +from ayon_core.tools.utils import ( paint_image_with_color, ClickableLabel, ) # TODO change imports -from openpype.tools.resources import get_image -from openpype.tools.utils import ( +from ayon_core.tools.resources import get_image +from ayon_core.tools.utils import ( IconButton, PixmapLabel ) diff --git a/client/ayon_core/tools/attribute_defs/widgets.py b/client/ayon_core/tools/attribute_defs/widgets.py index 7dea01e0a8..368b186ea0 100644 --- a/client/ayon_core/tools/attribute_defs/widgets.py +++ b/client/ayon_core/tools/attribute_defs/widgets.py @@ -2,7 +2,7 @@ import copy from qtpy import QtWidgets, QtCore -from openpype.lib.attribute_definitions import ( +from ayon_core.lib.attribute_definitions import ( AbstractAttrDef, UnknownDef, HiddenDef, @@ -15,13 +15,13 @@ from openpype.lib.attribute_definitions import ( UISeparatorDef, UILabelDef ) -from openpype.tools.utils import ( +from ayon_core.tools.utils import ( CustomTextComboBox, FocusSpinBox, FocusDoubleSpinBox, MultiSelectionComboBox, ) -from openpype.widgets.nice_checkbox import NiceCheckbox +from ayon_core.widgets.nice_checkbox import NiceCheckbox from .files_widget import FilesWidget diff --git a/client/ayon_core/tools/ayon_launcher/control.py b/client/ayon_core/tools/ayon_launcher/control.py index 36c0536422..8780b211f1 100644 --- a/client/ayon_core/tools/ayon_launcher/control.py +++ b/client/ayon_core/tools/ayon_launcher/control.py @@ -1,7 +1,7 @@ -from openpype.lib import Logger -from openpype.lib.events import QueuedEventSystem -from openpype.settings import get_project_settings -from openpype.tools.ayon_utils.models import ProjectsModel, HierarchyModel +from ayon_core.lib import Logger +from ayon_core.lib.events import QueuedEventSystem +from ayon_core.settings import get_project_settings +from ayon_core.tools.ayon_utils.models import ProjectsModel, HierarchyModel from .abstract import AbstractLauncherFrontEnd, AbstractLauncherBackend from .models import LauncherSelectionModel, ActionsModel diff --git a/client/ayon_core/tools/ayon_launcher/models/actions.py b/client/ayon_core/tools/ayon_launcher/models/actions.py index d7c4219dc2..35f6eb5995 100644 --- a/client/ayon_core/tools/ayon_launcher/models/actions.py +++ b/client/ayon_core/tools/ayon_launcher/models/actions.py @@ -1,8 +1,8 @@ import os -from openpype import resources -from openpype.lib import Logger, OpenPypeSettingsRegistry -from openpype.pipeline.actions import ( +from ayon_core import resources +from ayon_core.lib import Logger, OpenPypeSettingsRegistry +from ayon_core.pipeline.actions import ( discover_launcher_actions, LauncherAction, ) @@ -99,7 +99,7 @@ class ApplicationAction(LauncherAction): def _show_message_box(self, title, message, details=None): from qtpy import QtWidgets, QtGui - from openpype import style + from ayon_core import style dialog = QtWidgets.QMessageBox() icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) @@ -114,7 +114,7 @@ class ApplicationAction(LauncherAction): def process(self, session, **kwargs): """Process the full Application action""" - from openpype.lib import ( + from ayon_core.lib import ( ApplictionExecutableNotFound, ApplicationLaunchFailed, ) @@ -474,7 +474,7 @@ class ActionsModel: return action_items def _get_applications_action_classes(self): - from openpype.lib.applications import ( + from ayon_core.lib.applications import ( CUSTOM_LAUNCH_APP_GROUPS, ApplicationManager, ) diff --git a/client/ayon_core/tools/ayon_launcher/ui/actions_widget.py b/client/ayon_core/tools/ayon_launcher/ui/actions_widget.py index 2a1a06695d..6667b4ed5f 100644 --- a/client/ayon_core/tools/ayon_launcher/ui/actions_widget.py +++ b/client/ayon_core/tools/ayon_launcher/ui/actions_widget.py @@ -3,8 +3,8 @@ import collections from qtpy import QtWidgets, QtCore, QtGui -from openpype.tools.flickcharm import FlickCharm -from openpype.tools.ayon_utils.widgets import get_qt_icon +from ayon_core.tools.flickcharm import FlickCharm +from ayon_core.tools.ayon_utils.widgets import get_qt_icon from .resources import get_options_image_path diff --git a/client/ayon_core/tools/ayon_launcher/ui/hierarchy_page.py b/client/ayon_core/tools/ayon_launcher/ui/hierarchy_page.py index d56d43fdec..5b5f88a802 100644 --- a/client/ayon_core/tools/ayon_launcher/ui/hierarchy_page.py +++ b/client/ayon_core/tools/ayon_launcher/ui/hierarchy_page.py @@ -1,12 +1,12 @@ import qtawesome from qtpy import QtWidgets, QtCore -from openpype.tools.utils import ( +from ayon_core.tools.utils import ( PlaceholderLineEdit, SquareButton, RefreshButton, ) -from openpype.tools.ayon_utils.widgets import ( +from ayon_core.tools.ayon_utils.widgets import ( ProjectsCombobox, FoldersWidget, TasksWidget, diff --git a/client/ayon_core/tools/ayon_launcher/ui/projects_widget.py b/client/ayon_core/tools/ayon_launcher/ui/projects_widget.py index 38c7f62bd5..729caf3232 100644 --- a/client/ayon_core/tools/ayon_launcher/ui/projects_widget.py +++ b/client/ayon_core/tools/ayon_launcher/ui/projects_widget.py @@ -1,12 +1,12 @@ from qtpy import QtWidgets, QtCore -from openpype.tools.flickcharm import FlickCharm -from openpype.tools.utils import PlaceholderLineEdit, RefreshButton -from openpype.tools.ayon_utils.widgets import ( +from ayon_core.tools.flickcharm import FlickCharm +from ayon_core.tools.utils import PlaceholderLineEdit, RefreshButton +from ayon_core.tools.ayon_utils.widgets import ( ProjectsQtModel, ProjectSortFilterProxy, ) -from openpype.tools.ayon_utils.models import PROJECTS_MODEL_SENDER +from ayon_core.tools.ayon_utils.models import PROJECTS_MODEL_SENDER class ProjectIconView(QtWidgets.QListView): diff --git a/client/ayon_core/tools/ayon_launcher/ui/window.py b/client/ayon_core/tools/ayon_launcher/ui/window.py index ffc74a2fdc..45788fe2f6 100644 --- a/client/ayon_core/tools/ayon_launcher/ui/window.py +++ b/client/ayon_core/tools/ayon_launcher/ui/window.py @@ -1,9 +1,9 @@ from qtpy import QtWidgets, QtCore, QtGui -from openpype import style -from openpype import resources +from ayon_core import style +from ayon_core import resources -from openpype.tools.ayon_launcher.control import BaseLauncherController +from ayon_core.tools.ayon_launcher.control import BaseLauncherController from .projects_widget import ProjectsWidget from .hierarchy_page import HierarchyPage diff --git a/client/ayon_core/tools/ayon_loader/abstract.py b/client/ayon_core/tools/ayon_loader/abstract.py index 1d93716e07..81169f7775 100644 --- a/client/ayon_core/tools/ayon_loader/abstract.py +++ b/client/ayon_core/tools/ayon_loader/abstract.py @@ -1,7 +1,7 @@ from abc import ABCMeta, abstractmethod import six -from openpype.lib.attribute_definitions import ( +from ayon_core.lib.attribute_definitions import ( AbstractAttrDef, serialize_attr_defs, deserialize_attr_defs, diff --git a/client/ayon_core/tools/ayon_loader/control.py b/client/ayon_core/tools/ayon_loader/control.py index 060cef6661..29ca06e3e2 100644 --- a/client/ayon_core/tools/ayon_loader/control.py +++ b/client/ayon_core/tools/ayon_loader/control.py @@ -3,10 +3,10 @@ import uuid import ayon_api -from openpype.lib.events import QueuedEventSystem -from openpype.pipeline import Anatomy, get_current_context -from openpype.host import ILoadHost -from openpype.tools.ayon_utils.models import ( +from ayon_core.lib.events import QueuedEventSystem +from ayon_core.pipeline import Anatomy, get_current_context +from ayon_core.host import ILoadHost +from ayon_core.tools.ayon_utils.models import ( ProjectsModel, HierarchyModel, NestedCacheItem, diff --git a/client/ayon_core/tools/ayon_loader/models/actions.py b/client/ayon_core/tools/ayon_loader/models/actions.py index 177335a933..e83d816dee 100644 --- a/client/ayon_core/tools/ayon_loader/models/actions.py +++ b/client/ayon_core/tools/ayon_loader/models/actions.py @@ -5,14 +5,14 @@ import copy import collections import uuid -from openpype.client import ( +from ayon_core.client import ( get_project, get_assets, get_subsets, get_versions, get_representations, ) -from openpype.pipeline.load import ( +from ayon_core.pipeline.load import ( discover_loader_plugins, SubsetLoaderPlugin, filter_repre_contexts_by_loader, @@ -23,8 +23,8 @@ from openpype.pipeline.load import ( LoadError, IncompatibleLoaderError, ) -from openpype.tools.ayon_utils.models import NestedCacheItem -from openpype.tools.ayon_loader.abstract import ActionItem +from ayon_core.tools.ayon_utils.models import NestedCacheItem +from ayon_core.tools.ayon_loader.abstract import ActionItem ACTIONS_MODEL_SENDER = "actions.model" NOT_SET = object() diff --git a/client/ayon_core/tools/ayon_loader/models/products.py b/client/ayon_core/tools/ayon_loader/models/products.py index 40b6474d12..90792d0623 100644 --- a/client/ayon_core/tools/ayon_loader/models/products.py +++ b/client/ayon_core/tools/ayon_loader/models/products.py @@ -5,9 +5,9 @@ import arrow import ayon_api from ayon_api.operations import OperationsSession -from openpype.style import get_default_entity_icon_color -from openpype.tools.ayon_utils.models import NestedCacheItem -from openpype.tools.ayon_loader.abstract import ( +from ayon_core.style import get_default_entity_icon_color +from ayon_core.tools.ayon_utils.models import NestedCacheItem +from ayon_core.tools.ayon_loader.abstract import ( ProductTypeItem, ProductItem, VersionItem, diff --git a/client/ayon_core/tools/ayon_loader/models/site_sync.py b/client/ayon_core/tools/ayon_loader/models/site_sync.py index 4b7ddee481..2acea9645c 100644 --- a/client/ayon_core/tools/ayon_loader/models/site_sync.py +++ b/client/ayon_core/tools/ayon_loader/models/site_sync.py @@ -1,11 +1,11 @@ import collections -from openpype.lib import Logger -from openpype.client.entities import get_representations -from openpype.client import get_linked_representation_id -from openpype.modules import ModulesManager -from openpype.tools.ayon_utils.models import NestedCacheItem -from openpype.tools.ayon_loader.abstract import ActionItem +from ayon_core.lib import Logger +from ayon_core.client.entities import get_representations +from ayon_core.client import get_linked_representation_id +from ayon_core.modules import ModulesManager +from ayon_core.tools.ayon_utils.models import NestedCacheItem +from ayon_core.tools.ayon_loader.abstract import ActionItem DOWNLOAD_IDENTIFIER = "sitesync.download" UPLOAD_IDENTIFIER = "sitesync.upload" diff --git a/client/ayon_core/tools/ayon_loader/ui/actions_utils.py b/client/ayon_core/tools/ayon_loader/ui/actions_utils.py index a269b643dc..bf6ab6eeb5 100644 --- a/client/ayon_core/tools/ayon_loader/ui/actions_utils.py +++ b/client/ayon_core/tools/ayon_loader/ui/actions_utils.py @@ -3,14 +3,14 @@ import uuid from qtpy import QtWidgets, QtGui import qtawesome -from openpype.lib.attribute_definitions import AbstractAttrDef -from openpype.tools.attribute_defs import AttributeDefinitionsDialog -from openpype.tools.utils.widgets import ( +from ayon_core.lib.attribute_definitions import AbstractAttrDef +from ayon_core.tools.attribute_defs import AttributeDefinitionsDialog +from ayon_core.tools.utils.widgets import ( OptionalMenu, OptionalAction, OptionDialog, ) -from openpype.tools.ayon_utils.widgets import get_qt_icon +from ayon_core.tools.ayon_utils.widgets import get_qt_icon def show_actions_menu(action_items, global_point, one_item_selected, parent): diff --git a/client/ayon_core/tools/ayon_loader/ui/folders_widget.py b/client/ayon_core/tools/ayon_loader/ui/folders_widget.py index eaaf7ca617..9d5b95b2a6 100644 --- a/client/ayon_core/tools/ayon_loader/ui/folders_widget.py +++ b/client/ayon_core/tools/ayon_loader/ui/folders_widget.py @@ -1,17 +1,17 @@ import qtpy from qtpy import QtWidgets, QtCore, QtGui -from openpype.tools.utils import ( +from ayon_core.tools.utils import ( RecursiveSortFilterProxyModel, DeselectableTreeView, ) -from openpype.style import get_objected_colors +from ayon_core.style import get_objected_colors -from openpype.tools.ayon_utils.widgets import ( +from ayon_core.tools.ayon_utils.widgets import ( FoldersQtModel, FOLDERS_MODEL_SENDER_NAME, ) -from openpype.tools.ayon_utils.widgets.folders_widget import FOLDER_ID_ROLE +from ayon_core.tools.ayon_utils.widgets.folders_widget import FOLDER_ID_ROLE if qtpy.API == "pyside": from PySide.QtGui import QStyleOptionViewItemV4 diff --git a/client/ayon_core/tools/ayon_loader/ui/info_widget.py b/client/ayon_core/tools/ayon_loader/ui/info_widget.py index b7d1b0811f..16b817a38d 100644 --- a/client/ayon_core/tools/ayon_loader/ui/info_widget.py +++ b/client/ayon_core/tools/ayon_loader/ui/info_widget.py @@ -2,7 +2,7 @@ import datetime from qtpy import QtWidgets -from openpype.tools.utils.lib import format_version +from ayon_core.tools.utils.lib import format_version class VersionTextEdit(QtWidgets.QTextEdit): diff --git a/client/ayon_core/tools/ayon_loader/ui/product_group_dialog.py b/client/ayon_core/tools/ayon_loader/ui/product_group_dialog.py index 5737ce58a4..edae78c9a1 100644 --- a/client/ayon_core/tools/ayon_loader/ui/product_group_dialog.py +++ b/client/ayon_core/tools/ayon_loader/ui/product_group_dialog.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets -from openpype.tools.utils import PlaceholderLineEdit +from ayon_core.tools.utils import PlaceholderLineEdit class ProductGroupDialog(QtWidgets.QDialog): diff --git a/client/ayon_core/tools/ayon_loader/ui/product_types_widget.py b/client/ayon_core/tools/ayon_loader/ui/product_types_widget.py index a84a7ff846..26244517ec 100644 --- a/client/ayon_core/tools/ayon_loader/ui/product_types_widget.py +++ b/client/ayon_core/tools/ayon_loader/ui/product_types_widget.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets, QtGui, QtCore -from openpype.tools.ayon_utils.widgets import get_qt_icon +from ayon_core.tools.ayon_utils.widgets import get_qt_icon PRODUCT_TYPE_ROLE = QtCore.Qt.UserRole + 1 diff --git a/client/ayon_core/tools/ayon_loader/ui/products_delegates.py b/client/ayon_core/tools/ayon_loader/ui/products_delegates.py index 979fa57fd2..53d35c2bb7 100644 --- a/client/ayon_core/tools/ayon_loader/ui/products_delegates.py +++ b/client/ayon_core/tools/ayon_loader/ui/products_delegates.py @@ -1,7 +1,7 @@ import numbers from qtpy import QtWidgets, QtCore, QtGui -from openpype.tools.utils.lib import format_version +from ayon_core.tools.utils.lib import format_version from .products_model import ( PRODUCT_ID_ROLE, diff --git a/client/ayon_core/tools/ayon_loader/ui/products_model.py b/client/ayon_core/tools/ayon_loader/ui/products_model.py index 84f5bc9a5f..331efad68a 100644 --- a/client/ayon_core/tools/ayon_loader/ui/products_model.py +++ b/client/ayon_core/tools/ayon_loader/ui/products_model.py @@ -3,8 +3,8 @@ import collections import qtawesome from qtpy import QtGui, QtCore -from openpype.style import get_default_entity_icon_color -from openpype.tools.ayon_utils.widgets import get_qt_icon +from ayon_core.style import get_default_entity_icon_color +from ayon_core.tools.ayon_utils.widgets import get_qt_icon PRODUCTS_MODEL_SENDER_NAME = "qt_products_model" diff --git a/client/ayon_core/tools/ayon_loader/ui/products_widget.py b/client/ayon_core/tools/ayon_loader/ui/products_widget.py index 99faefe693..5a29f3f762 100644 --- a/client/ayon_core/tools/ayon_loader/ui/products_widget.py +++ b/client/ayon_core/tools/ayon_loader/ui/products_widget.py @@ -2,11 +2,11 @@ import collections from qtpy import QtWidgets, QtCore -from openpype.tools.utils import ( +from ayon_core.tools.utils import ( RecursiveSortFilterProxyModel, DeselectableTreeView, ) -from openpype.tools.utils.delegates import PrettyTimeDelegate +from ayon_core.tools.utils.delegates import PrettyTimeDelegate from .products_model import ( ProductsModel, diff --git a/client/ayon_core/tools/ayon_loader/ui/repres_widget.py b/client/ayon_core/tools/ayon_loader/ui/repres_widget.py index efc1bb89a4..27db8dda40 100644 --- a/client/ayon_core/tools/ayon_loader/ui/repres_widget.py +++ b/client/ayon_core/tools/ayon_loader/ui/repres_widget.py @@ -3,9 +3,9 @@ import collections from qtpy import QtWidgets, QtGui, QtCore import qtawesome -from openpype.style import get_default_entity_icon_color -from openpype.tools.ayon_utils.widgets import get_qt_icon -from openpype.tools.utils import DeselectableTreeView +from ayon_core.style import get_default_entity_icon_color +from ayon_core.tools.ayon_utils.widgets import get_qt_icon +from ayon_core.tools.utils import DeselectableTreeView from .actions_utils import show_actions_menu diff --git a/client/ayon_core/tools/ayon_loader/ui/window.py b/client/ayon_core/tools/ayon_loader/ui/window.py index 8982d92c0f..357aabb2bb 100644 --- a/client/ayon_core/tools/ayon_loader/ui/window.py +++ b/client/ayon_core/tools/ayon_loader/ui/window.py @@ -1,17 +1,17 @@ from qtpy import QtWidgets, QtCore, QtGui -from openpype.resources import get_openpype_icon_filepath -from openpype.style import load_stylesheet -from openpype.tools.utils import ( +from ayon_core.resources import get_openpype_icon_filepath +from ayon_core.style import load_stylesheet +from ayon_core.tools.utils import ( PlaceholderLineEdit, ErrorMessageBox, ThumbnailPainterWidget, RefreshButton, GoToCurrentButton, ) -from openpype.tools.utils.lib import center_window -from openpype.tools.ayon_utils.widgets import ProjectsCombobox -from openpype.tools.ayon_loader.control import LoaderController +from ayon_core.tools.utils.lib import center_window +from ayon_core.tools.ayon_utils.widgets import ProjectsCombobox +from ayon_core.tools.ayon_loader.control import LoaderController from .folders_widget import LoaderFoldersWidget from .products_widget import ProductsWidget diff --git a/client/ayon_core/tools/ayon_push_to_project/control.py b/client/ayon_core/tools/ayon_push_to_project/control.py index 0a19136701..1336721e5a 100644 --- a/client/ayon_core/tools/ayon_push_to_project/control.py +++ b/client/ayon_core/tools/ayon_push_to_project/control.py @@ -1,16 +1,16 @@ import threading -from openpype.client import ( +from ayon_core.client import ( get_asset_by_id, get_subset_by_id, get_version_by_id, get_representations, ) -from openpype.settings import get_project_settings -from openpype.lib import prepare_template_data -from openpype.lib.events import QueuedEventSystem -from openpype.pipeline.create import get_subset_name_template -from openpype.tools.ayon_utils.models import ProjectsModel, HierarchyModel +from ayon_core.settings import get_project_settings +from ayon_core.lib import prepare_template_data +from ayon_core.lib.events import QueuedEventSystem +from ayon_core.pipeline.create import get_subset_name_template +from ayon_core.tools.ayon_utils.models import ProjectsModel, HierarchyModel from .models import ( PushToProjectSelectionModel, diff --git a/client/ayon_core/tools/ayon_push_to_project/main.py b/client/ayon_core/tools/ayon_push_to_project/main.py index e36940e488..5a340656fb 100644 --- a/client/ayon_core/tools/ayon_push_to_project/main.py +++ b/client/ayon_core/tools/ayon_push_to_project/main.py @@ -1,7 +1,7 @@ import click -from openpype.tools.utils import get_openpype_qt_app -from openpype.tools.ayon_push_to_project.ui import PushToContextSelectWindow +from ayon_core.tools.utils import get_openpype_qt_app +from ayon_core.tools.ayon_push_to_project.ui import PushToContextSelectWindow def main_show(project_name, version_id): diff --git a/client/ayon_core/tools/ayon_push_to_project/models/integrate.py b/client/ayon_core/tools/ayon_push_to_project/models/integrate.py index 976d8cb4f0..4f23f97b98 100644 --- a/client/ayon_core/tools/ayon_push_to_project/models/integrate.py +++ b/client/ayon_core/tools/ayon_push_to_project/models/integrate.py @@ -10,7 +10,7 @@ import uuid from bson.objectid import ObjectId -from openpype.client import ( +from ayon_core.client import ( get_project, get_assets, get_asset_by_id, @@ -21,7 +21,7 @@ from openpype.client import ( get_version_by_name, get_representations, ) -from openpype.client.operations import ( +from ayon_core.client.operations import ( OperationsSession, new_asset_document, new_subset_document, @@ -30,21 +30,21 @@ from openpype.client.operations import ( prepare_version_update_data, prepare_representation_update_data, ) -from openpype.modules import ModulesManager -from openpype.lib import ( +from ayon_core.modules import ModulesManager +from ayon_core.lib import ( StringTemplate, get_openpype_username, get_formatted_current_time, source_hash, ) -from openpype.lib.file_transaction import FileTransaction -from openpype.settings import get_project_settings -from openpype.pipeline import Anatomy -from openpype.pipeline.version_start import get_versioning_start -from openpype.pipeline.template_data import get_template_data -from openpype.pipeline.publish import get_publish_template_name -from openpype.pipeline.create import get_subset_name +from ayon_core.lib.file_transaction import FileTransaction +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import Anatomy +from ayon_core.pipeline.version_start import get_versioning_start +from ayon_core.pipeline.template_data import get_template_data +from ayon_core.pipeline.publish import get_publish_template_name +from ayon_core.pipeline.create import get_subset_name UNKNOWN = object() diff --git a/client/ayon_core/tools/ayon_push_to_project/models/user_values.py b/client/ayon_core/tools/ayon_push_to_project/models/user_values.py index 2a4faeb136..a12a1513ee 100644 --- a/client/ayon_core/tools/ayon_push_to_project/models/user_values.py +++ b/client/ayon_core/tools/ayon_push_to_project/models/user_values.py @@ -1,6 +1,6 @@ import re -from openpype.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS +from ayon_core.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS class UserPublishValuesModel: diff --git a/client/ayon_core/tools/ayon_push_to_project/ui/window.py b/client/ayon_core/tools/ayon_push_to_project/ui/window.py index 535c01c643..d31781dba7 100644 --- a/client/ayon_core/tools/ayon_push_to_project/ui/window.py +++ b/client/ayon_core/tools/ayon_push_to_project/ui/window.py @@ -1,17 +1,17 @@ from qtpy import QtWidgets, QtGui, QtCore -from openpype.style import load_stylesheet, get_app_icon_path -from openpype.tools.utils import ( +from ayon_core.style import load_stylesheet, get_app_icon_path +from ayon_core.tools.utils import ( PlaceholderLineEdit, SeparatorWidget, set_style_property, ) -from openpype.tools.ayon_utils.widgets import ( +from ayon_core.tools.ayon_utils.widgets import ( ProjectsCombobox, FoldersWidget, TasksWidget, ) -from openpype.tools.ayon_push_to_project.control import ( +from ayon_core.tools.ayon_push_to_project.control import ( PushToContextController, ) diff --git a/client/ayon_core/tools/ayon_sceneinventory/control.py b/client/ayon_core/tools/ayon_sceneinventory/control.py index 3b063ff72e..409f92b506 100644 --- a/client/ayon_core/tools/ayon_sceneinventory/control.py +++ b/client/ayon_core/tools/ayon_sceneinventory/control.py @@ -1,12 +1,12 @@ import ayon_api -from openpype.lib.events import QueuedEventSystem -from openpype.host import ILoadHost -from openpype.pipeline import ( +from ayon_core.lib.events import QueuedEventSystem +from ayon_core.host import ILoadHost +from ayon_core.pipeline import ( registered_host, get_current_context, ) -from openpype.tools.ayon_utils.models import HierarchyModel +from ayon_core.tools.ayon_utils.models import HierarchyModel from .models import SiteSyncModel diff --git a/client/ayon_core/tools/ayon_sceneinventory/model.py b/client/ayon_core/tools/ayon_sceneinventory/model.py index f4450f0ac3..05ecfd442d 100644 --- a/client/ayon_core/tools/ayon_sceneinventory/model.py +++ b/client/ayon_core/tools/ayon_sceneinventory/model.py @@ -9,21 +9,21 @@ from collections import defaultdict from qtpy import QtCore, QtGui import qtawesome -from openpype.client import ( +from ayon_core.client import ( get_assets, get_subsets, get_versions, get_last_version_by_subset_id, get_representations, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_current_project_name, schema, HeroVersionType, ) -from openpype.style import get_default_entity_icon_color -from openpype.tools.utils.models import TreeModel, Item -from openpype.tools.ayon_utils.widgets import get_qt_icon +from ayon_core.style import get_default_entity_icon_color +from ayon_core.tools.utils.models import TreeModel, Item +from ayon_core.tools.ayon_utils.widgets import get_qt_icon def walk_hierarchy(node): diff --git a/client/ayon_core/tools/ayon_sceneinventory/models/site_sync.py b/client/ayon_core/tools/ayon_sceneinventory/models/site_sync.py index bd65ad1778..0b6dffb909 100644 --- a/client/ayon_core/tools/ayon_sceneinventory/models/site_sync.py +++ b/client/ayon_core/tools/ayon_sceneinventory/models/site_sync.py @@ -1,5 +1,5 @@ -from openpype.client import get_representations -from openpype.modules import ModulesManager +from ayon_core.client import get_representations +from ayon_core.modules import ModulesManager NOT_SET = object() diff --git a/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/dialog.py b/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/dialog.py index 1d1bd1adbc..89c3b652e1 100644 --- a/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/dialog.py +++ b/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/dialog.py @@ -4,7 +4,7 @@ import logging from qtpy import QtWidgets, QtCore import qtawesome -from openpype.client import ( +from ayon_core.client import ( get_assets, get_subset_by_name, get_subsets, @@ -13,7 +13,7 @@ from openpype.client import ( get_last_versions, get_representations, ) -from openpype.pipeline.load import ( +from ayon_core.pipeline.load import ( discover_loader_plugins, switch_container, get_repres_contexts, diff --git a/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/folders_input.py b/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/folders_input.py index 699c62371a..2358a82a7f 100644 --- a/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/folders_input.py +++ b/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/folders_input.py @@ -1,12 +1,12 @@ from qtpy import QtWidgets, QtCore import qtawesome -from openpype.tools.utils import ( +from ayon_core.tools.utils import ( PlaceholderLineEdit, BaseClickableFrame, set_style_property, ) -from openpype.tools.ayon_utils.widgets import FoldersWidget +from ayon_core.tools.ayon_utils.widgets import FoldersWidget NOT_SET = object() diff --git a/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/widgets.py b/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/widgets.py index 50a49e0ce1..6d5c00c199 100644 --- a/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/widgets.py +++ b/client/ayon_core/tools/ayon_sceneinventory/switch_dialog/widgets.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets, QtCore -from openpype import style +from ayon_core import style class ButtonWithMenu(QtWidgets.QToolButton): diff --git a/client/ayon_core/tools/ayon_sceneinventory/view.py b/client/ayon_core/tools/ayon_sceneinventory/view.py index 039b498b1b..214be68ae0 100644 --- a/client/ayon_core/tools/ayon_sceneinventory/view.py +++ b/client/ayon_core/tools/ayon_sceneinventory/view.py @@ -7,21 +7,21 @@ from functools import partial from qtpy import QtWidgets, QtCore import qtawesome -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_versions, get_hero_versions, get_representation_by_id, get_representations, ) -from openpype import style -from openpype.pipeline import ( +from ayon_core import style +from ayon_core.pipeline import ( HeroVersionType, update_container, remove_container, discover_inventory_actions, ) -from openpype.tools.utils.lib import ( +from ayon_core.tools.utils.lib import ( iter_model_rows, format_version ) diff --git a/client/ayon_core/tools/ayon_sceneinventory/window.py b/client/ayon_core/tools/ayon_sceneinventory/window.py index 427bf4c50d..d0ccf1d5d2 100644 --- a/client/ayon_core/tools/ayon_sceneinventory/window.py +++ b/client/ayon_core/tools/ayon_sceneinventory/window.py @@ -1,13 +1,13 @@ from qtpy import QtWidgets, QtCore, QtGui import qtawesome -from openpype import style, resources -from openpype.tools.utils.delegates import VersionDelegate -from openpype.tools.utils.lib import ( +from ayon_core import style, resources +from ayon_core.tools.utils.delegates import VersionDelegate +from ayon_core.tools.utils.lib import ( preserve_expanded_rows, preserve_selection, ) -from openpype.tools.ayon_sceneinventory import SceneInventoryController +from ayon_core.tools.ayon_sceneinventory import SceneInventoryController from .model import ( InventoryModel, diff --git a/client/ayon_core/tools/ayon_utils/models/hierarchy.py b/client/ayon_core/tools/ayon_utils/models/hierarchy.py index fc6b8e1eb7..07773dfb78 100644 --- a/client/ayon_core/tools/ayon_utils/models/hierarchy.py +++ b/client/ayon_core/tools/ayon_utils/models/hierarchy.py @@ -5,7 +5,7 @@ from abc import ABCMeta, abstractmethod import ayon_api import six -from openpype.style import get_default_entity_icon_color +from ayon_core.style import get_default_entity_icon_color from .cache import NestedCacheItem diff --git a/client/ayon_core/tools/ayon_utils/models/projects.py b/client/ayon_core/tools/ayon_utils/models/projects.py index 36d53edc24..e30561000e 100644 --- a/client/ayon_core/tools/ayon_utils/models/projects.py +++ b/client/ayon_core/tools/ayon_utils/models/projects.py @@ -4,7 +4,7 @@ from abc import ABCMeta, abstractmethod import ayon_api import six -from openpype.style import get_default_entity_icon_color +from ayon_core.style import get_default_entity_icon_color from .cache import CacheItem diff --git a/client/ayon_core/tools/ayon_utils/models/thumbnails.py b/client/ayon_core/tools/ayon_utils/models/thumbnails.py index 40892338df..3c360df1d9 100644 --- a/client/ayon_core/tools/ayon_utils/models/thumbnails.py +++ b/client/ayon_core/tools/ayon_utils/models/thumbnails.py @@ -2,7 +2,7 @@ import collections import ayon_api -from openpype.client.server.thumbnails import AYONThumbnailCache +from ayon_core.client.server.thumbnails import AYONThumbnailCache from .cache import NestedCacheItem diff --git a/client/ayon_core/tools/ayon_utils/widgets/folders_widget.py b/client/ayon_core/tools/ayon_utils/widgets/folders_widget.py index 44323a192c..1e395b0368 100644 --- a/client/ayon_core/tools/ayon_utils/widgets/folders_widget.py +++ b/client/ayon_core/tools/ayon_utils/widgets/folders_widget.py @@ -2,7 +2,7 @@ import collections from qtpy import QtWidgets, QtGui, QtCore -from openpype.tools.utils import ( +from ayon_core.tools.utils import ( RecursiveSortFilterProxyModel, TreeView, ) diff --git a/client/ayon_core/tools/ayon_utils/widgets/projects_widget.py b/client/ayon_core/tools/ayon_utils/widgets/projects_widget.py index 728433f929..d3bebecfd6 100644 --- a/client/ayon_core/tools/ayon_utils/widgets/projects_widget.py +++ b/client/ayon_core/tools/ayon_utils/widgets/projects_widget.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets, QtCore, QtGui -from openpype.tools.ayon_utils.models import PROJECTS_MODEL_SENDER +from ayon_core.tools.ayon_utils.models import PROJECTS_MODEL_SENDER from .utils import RefreshThread, get_qt_icon PROJECT_NAME_ROLE = QtCore.Qt.UserRole + 1 diff --git a/client/ayon_core/tools/ayon_utils/widgets/tasks_widget.py b/client/ayon_core/tools/ayon_utils/widgets/tasks_widget.py index f27711acdd..3d6cc47fe3 100644 --- a/client/ayon_core/tools/ayon_utils/widgets/tasks_widget.py +++ b/client/ayon_core/tools/ayon_utils/widgets/tasks_widget.py @@ -1,7 +1,7 @@ from qtpy import QtWidgets, QtGui, QtCore -from openpype.style import get_disabled_entity_icon_color -from openpype.tools.utils import DeselectableTreeView +from ayon_core.style import get_disabled_entity_icon_color +from ayon_core.tools.utils import DeselectableTreeView from .utils import RefreshThread, get_qt_icon diff --git a/client/ayon_core/tools/ayon_utils/widgets/utils.py b/client/ayon_core/tools/ayon_utils/widgets/utils.py index 5165b3a262..ead8f4edb2 100644 --- a/client/ayon_core/tools/ayon_utils/widgets/utils.py +++ b/client/ayon_core/tools/ayon_utils/widgets/utils.py @@ -3,7 +3,7 @@ from functools import partial from qtpy import QtCore, QtGui -from openpype.tools.utils.lib import get_qta_icon_by_name_and_color +from ayon_core.tools.utils.lib import get_qta_icon_by_name_and_color class RefreshThread(QtCore.QThread): diff --git a/client/ayon_core/tools/ayon_workfiles/abstract.py b/client/ayon_core/tools/ayon_workfiles/abstract.py index 260f701d4b..c9eb9004e3 100644 --- a/client/ayon_core/tools/ayon_workfiles/abstract.py +++ b/client/ayon_core/tools/ayon_workfiles/abstract.py @@ -2,7 +2,7 @@ import os from abc import ABCMeta, abstractmethod import six -from openpype.style import get_default_entity_icon_color +from ayon_core.style import get_default_entity_icon_color class WorkfileInfo: diff --git a/client/ayon_core/tools/ayon_workfiles/control.py b/client/ayon_core/tools/ayon_workfiles/control.py index 9d19571267..3e384c80b0 100644 --- a/client/ayon_core/tools/ayon_workfiles/control.py +++ b/client/ayon_core/tools/ayon_workfiles/control.py @@ -3,20 +3,20 @@ import shutil import ayon_api -from openpype.client import get_asset_by_id -from openpype.host import IWorkfileHost -from openpype.lib import Logger, emit_event -from openpype.lib.events import QueuedEventSystem -from openpype.settings import get_project_settings -from openpype.pipeline import Anatomy, registered_host -from openpype.pipeline.context_tools import ( +from ayon_core.client import get_asset_by_id +from ayon_core.host import IWorkfileHost +from ayon_core.lib import Logger, emit_event +from ayon_core.lib.events import QueuedEventSystem +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import Anatomy, registered_host +from ayon_core.pipeline.context_tools import ( change_current_context, get_current_host_name, get_global_context, ) -from openpype.pipeline.workfile import create_workdir_extra_folders +from ayon_core.pipeline.workfile import create_workdir_extra_folders -from openpype.tools.ayon_utils.models import ( +from ayon_core.tools.ayon_utils.models import ( HierarchyModel, HierarchyExpectedSelection, ProjectsModel, diff --git a/client/ayon_core/tools/ayon_workfiles/models/workfiles.py b/client/ayon_core/tools/ayon_workfiles/models/workfiles.py index f9f910ac8a..395c5dbd6f 100644 --- a/client/ayon_core/tools/ayon_workfiles/models/workfiles.py +++ b/client/ayon_core/tools/ayon_workfiles/models/workfiles.py @@ -6,20 +6,20 @@ import arrow import ayon_api from ayon_api.operations import OperationsSession -from openpype.client import get_project -from openpype.client.operations import ( +from ayon_core.client import get_project +from ayon_core.client.operations import ( prepare_workfile_info_update_data, ) -from openpype.pipeline.template_data import ( +from ayon_core.pipeline.template_data import ( get_template_data, ) -from openpype.pipeline.workfile import ( +from ayon_core.pipeline.workfile import ( get_workdir_with_workdir_data, get_workfile_template_key, get_last_workfile_with_version, ) -from openpype.pipeline.version_start import get_versioning_start -from openpype.tools.ayon_workfiles.abstract import ( +from ayon_core.pipeline.version_start import get_versioning_start +from ayon_core.tools.ayon_workfiles.abstract import ( WorkareaFilepathResult, FileItem, WorkfileInfo, diff --git a/client/ayon_core/tools/ayon_workfiles/widgets/files_widget_published.py b/client/ayon_core/tools/ayon_workfiles/widgets/files_widget_published.py index 704f7b2f39..bf36d790e9 100644 --- a/client/ayon_core/tools/ayon_workfiles/widgets/files_widget_published.py +++ b/client/ayon_core/tools/ayon_workfiles/widgets/files_widget_published.py @@ -1,12 +1,12 @@ import qtawesome from qtpy import QtWidgets, QtCore, QtGui -from openpype.style import ( +from ayon_core.style import ( get_default_entity_icon_color, get_disabled_entity_icon_color, ) -from openpype.tools.utils import TreeView -from openpype.tools.utils.delegates import PrettyTimeDelegate +from ayon_core.tools.utils import TreeView +from ayon_core.tools.utils.delegates import PrettyTimeDelegate from .utils import BaseOverlayFrame diff --git a/client/ayon_core/tools/ayon_workfiles/widgets/files_widget_workarea.py b/client/ayon_core/tools/ayon_workfiles/widgets/files_widget_workarea.py index 8eefd3cf81..6a1572deb2 100644 --- a/client/ayon_core/tools/ayon_workfiles/widgets/files_widget_workarea.py +++ b/client/ayon_core/tools/ayon_workfiles/widgets/files_widget_workarea.py @@ -1,12 +1,12 @@ import qtawesome from qtpy import QtWidgets, QtCore, QtGui -from openpype.style import ( +from ayon_core.style import ( get_default_entity_icon_color, get_disabled_entity_icon_color, ) -from openpype.tools.utils import TreeView -from openpype.tools.utils.delegates import PrettyTimeDelegate +from ayon_core.tools.utils import TreeView +from ayon_core.tools.utils.delegates import PrettyTimeDelegate FILENAME_ROLE = QtCore.Qt.UserRole + 1 FILEPATH_ROLE = QtCore.Qt.UserRole + 2 diff --git a/client/ayon_core/tools/ayon_workfiles/widgets/save_as_dialog.py b/client/ayon_core/tools/ayon_workfiles/widgets/save_as_dialog.py index cdce73f030..2ed2dd0659 100644 --- a/client/ayon_core/tools/ayon_workfiles/widgets/save_as_dialog.py +++ b/client/ayon_core/tools/ayon_workfiles/widgets/save_as_dialog.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets, QtCore -from openpype.tools.utils import PlaceholderLineEdit +from ayon_core.tools.utils import PlaceholderLineEdit class SubversionLineEdit(QtWidgets.QWidget): diff --git a/client/ayon_core/tools/ayon_workfiles/widgets/window.py b/client/ayon_core/tools/ayon_workfiles/widgets/window.py index eb2f2bc1c7..62ff542ff4 100644 --- a/client/ayon_core/tools/ayon_workfiles/widgets/window.py +++ b/client/ayon_core/tools/ayon_workfiles/widgets/window.py @@ -1,14 +1,14 @@ from qtpy import QtCore, QtWidgets, QtGui -from openpype import style, resources -from openpype.tools.utils import ( +from ayon_core import style, resources +from ayon_core.tools.utils import ( PlaceholderLineEdit, MessageOverlayObject, ) -from openpype.tools.ayon_utils.widgets import FoldersWidget, TasksWidget -from openpype.tools.ayon_workfiles.control import BaseWorkfileController -from openpype.tools.utils import GoToCurrentButton, RefreshButton +from ayon_core.tools.ayon_utils.widgets import FoldersWidget, TasksWidget +from ayon_core.tools.ayon_workfiles.control import BaseWorkfileController +from ayon_core.tools.utils import GoToCurrentButton, RefreshButton from .side_panel import SidePanelWidget from .files_widget import FilesWidget diff --git a/client/ayon_core/tools/context_dialog/__init__.py b/client/ayon_core/tools/context_dialog/__init__.py index 15b90463da..220b19dac5 100644 --- a/client/ayon_core/tools/context_dialog/__init__.py +++ b/client/ayon_core/tools/context_dialog/__init__.py @@ -1,4 +1,4 @@ -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED if AYON_SERVER_ENABLED: from ._ayon_window import ContextDialog, main diff --git a/client/ayon_core/tools/context_dialog/_ayon_window.py b/client/ayon_core/tools/context_dialog/_ayon_window.py index f347978392..e69a87ef12 100644 --- a/client/ayon_core/tools/context_dialog/_ayon_window.py +++ b/client/ayon_core/tools/context_dialog/_ayon_window.py @@ -4,18 +4,18 @@ import json import ayon_api from qtpy import QtWidgets, QtCore, QtGui -from openpype import style -from openpype.lib.events import QueuedEventSystem -from openpype.tools.ayon_utils.models import ( +from ayon_core import style +from ayon_core.lib.events import QueuedEventSystem +from ayon_core.tools.ayon_utils.models import ( ProjectsModel, HierarchyModel, ) -from openpype.tools.ayon_utils.widgets import ( +from ayon_core.tools.ayon_utils.widgets import ( ProjectsCombobox, FoldersWidget, TasksWidget, ) -from openpype.tools.utils.lib import ( +from ayon_core.tools.utils.lib import ( center_window, get_openpype_qt_app, ) diff --git a/client/ayon_core/tools/context_dialog/_openpype_window.py b/client/ayon_core/tools/context_dialog/_openpype_window.py index d370772a7f..85464c7b74 100644 --- a/client/ayon_core/tools/context_dialog/_openpype_window.py +++ b/client/ayon_core/tools/context_dialog/_openpype_window.py @@ -3,15 +3,15 @@ import json from qtpy import QtWidgets, QtCore, QtGui -from openpype import style -from openpype.pipeline import AvalonMongoDB -from openpype.tools.utils.lib import center_window, get_openpype_qt_app -from openpype.tools.utils.assets_widget import SingleSelectAssetsWidget -from openpype.tools.utils.constants import ( +from ayon_core import style +from ayon_core.pipeline import AvalonMongoDB +from ayon_core.tools.utils.lib import center_window, get_openpype_qt_app +from ayon_core.tools.utils.assets_widget import SingleSelectAssetsWidget +from ayon_core.tools.utils.constants import ( PROJECT_NAME_ROLE ) -from openpype.tools.utils.tasks_widget import TasksWidget -from openpype.tools.utils.models import ( +from ayon_core.tools.utils.tasks_widget import TasksWidget +from ayon_core.tools.utils.models import ( ProjectModel, ProjectSortFilterProxy ) diff --git a/client/ayon_core/tools/creator/model.py b/client/ayon_core/tools/creator/model.py index 6e905d0b56..3650993b9e 100644 --- a/client/ayon_core/tools/creator/model.py +++ b/client/ayon_core/tools/creator/model.py @@ -1,7 +1,7 @@ import uuid from qtpy import QtGui, QtCore -from openpype.pipeline import discover_legacy_creator_plugins +from ayon_core.pipeline import discover_legacy_creator_plugins from . constants import ( FAMILY_ROLE, diff --git a/client/ayon_core/tools/creator/widgets.py b/client/ayon_core/tools/creator/widgets.py index 0ebbd905e5..34e5fc538e 100644 --- a/client/ayon_core/tools/creator/widgets.py +++ b/client/ayon_core/tools/creator/widgets.py @@ -5,9 +5,9 @@ from qtpy import QtWidgets, QtCore, QtGui import qtawesome -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS -from openpype.tools.utils import ErrorMessageBox +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS +from ayon_core.tools.utils import ErrorMessageBox if hasattr(QtGui, "QRegularExpressionValidator"): RegularExpressionValidatorClass = QtGui.QRegularExpressionValidator diff --git a/client/ayon_core/tools/creator/window.py b/client/ayon_core/tools/creator/window.py index 117519e1d7..676e1c3959 100644 --- a/client/ayon_core/tools/creator/window.py +++ b/client/ayon_core/tools/creator/window.py @@ -4,16 +4,16 @@ import re from qtpy import QtWidgets, QtCore -from openpype.client import get_asset_by_name, get_subsets -from openpype import style -from openpype.settings import get_current_project_settings -from openpype.tools.utils.lib import qt_app_context -from openpype.pipeline import ( +from ayon_core.client import get_asset_by_name, get_subsets +from ayon_core import style +from ayon_core.settings import get_current_project_settings +from ayon_core.tools.utils.lib import qt_app_context +from ayon_core.pipeline import ( get_current_project_name, get_current_asset_name, get_current_task_name, ) -from openpype.pipeline.create import ( +from ayon_core.pipeline.create import ( SUBSET_NAME_ALLOWED_SYMBOLS, legacy_create, CreatorError, diff --git a/client/ayon_core/tools/experimental_tools/dialog.py b/client/ayon_core/tools/experimental_tools/dialog.py index 3a25d72ff4..5c282a89ae 100644 --- a/client/ayon_core/tools/experimental_tools/dialog.py +++ b/client/ayon_core/tools/experimental_tools/dialog.py @@ -1,7 +1,7 @@ from qtpy import QtWidgets, QtCore, QtGui -from openpype import AYON_SERVER_ENABLED -from openpype.style import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.style import ( load_stylesheet, app_icon_path ) diff --git a/client/ayon_core/tools/experimental_tools/tools_def.py b/client/ayon_core/tools/experimental_tools/tools_def.py index 5a5eec09ed..568c7032d0 100644 --- a/client/ayon_core/tools/experimental_tools/tools_def.py +++ b/client/ayon_core/tools/experimental_tools/tools_def.py @@ -1,5 +1,5 @@ import os -from openpype.settings import get_local_settings +from ayon_core.settings import get_local_settings # Constant key under which local settings are stored LOCAL_EXPERIMENTAL_KEY = "experimental_tools" @@ -162,7 +162,7 @@ class ExperimentalTools: def _show_publisher(self): if self._publisher_tool is None: - from openpype.tools.publisher.window import PublisherWindow + from ayon_core.tools.publisher.window import PublisherWindow self._publisher_tool = PublisherWindow( parent=self._parent_widget diff --git a/client/ayon_core/tools/launcher/actions.py b/client/ayon_core/tools/launcher/actions.py index 285b5d04ca..9952180c3c 100644 --- a/client/ayon_core/tools/launcher/actions.py +++ b/client/ayon_core/tools/launcher/actions.py @@ -1,13 +1,13 @@ from qtpy import QtWidgets, QtGui -from openpype import style -from openpype import resources -from openpype.lib import ( +from ayon_core import style +from ayon_core import resources +from ayon_core.lib import ( Logger, ApplictionExecutableNotFound, ApplicationLaunchFailed ) -from openpype.pipeline import LauncherAction +from ayon_core.pipeline import LauncherAction # TODO move to 'openpype.pipeline.actions' diff --git a/client/ayon_core/tools/launcher/lib.py b/client/ayon_core/tools/launcher/lib.py index 2507b6eddc..5ce45676cf 100644 --- a/client/ayon_core/tools/launcher/lib.py +++ b/client/ayon_core/tools/launcher/lib.py @@ -1,7 +1,7 @@ import os from qtpy import QtGui import qtawesome -from openpype import resources +from ayon_core import resources ICON_CACHE = {} NOT_FOUND = type("NotFound", (object, ), {}) diff --git a/client/ayon_core/tools/launcher/models.py b/client/ayon_core/tools/launcher/models.py index 63ffcc9365..31955f25c8 100644 --- a/client/ayon_core/tools/launcher/models.py +++ b/client/ayon_core/tools/launcher/models.py @@ -9,27 +9,27 @@ import appdirs from qtpy import QtCore, QtGui import qtawesome -from openpype.client import ( +from ayon_core.client import ( get_projects, get_project, get_assets, ) -from openpype.lib import JSONSettingRegistry -from openpype.lib.applications import ( +from ayon_core.lib import JSONSettingRegistry +from ayon_core.lib.applications import ( CUSTOM_LAUNCH_APP_GROUPS, ApplicationManager ) -from openpype.settings import get_project_settings -from openpype.pipeline import discover_launcher_actions -from openpype.tools.utils.lib import ( +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import discover_launcher_actions +from ayon_core.tools.utils.lib import ( DynamicQThread, get_project_icon, ) -from openpype.tools.utils.assets_widget import ( +from ayon_core.tools.utils.assets_widget import ( AssetModel, ASSET_NAME_ROLE ) -from openpype.tools.utils.tasks_widget import ( +from ayon_core.tools.utils.tasks_widget import ( TasksModel, TasksProxyModel, TASK_TYPE_ROLE, diff --git a/client/ayon_core/tools/launcher/widgets.py b/client/ayon_core/tools/launcher/widgets.py index a5bdd616b1..a1f8c133c4 100644 --- a/client/ayon_core/tools/launcher/widgets.py +++ b/client/ayon_core/tools/launcher/widgets.py @@ -4,9 +4,9 @@ import collections from qtpy import QtWidgets, QtCore, QtGui import qtawesome -from openpype.tools.flickcharm import FlickCharm -from openpype.tools.utils.assets_widget import SingleSelectAssetsWidget -from openpype.tools.utils.tasks_widget import TasksWidget +from ayon_core.tools.flickcharm import FlickCharm +from ayon_core.tools.utils.assets_widget import SingleSelectAssetsWidget +from ayon_core.tools.utils.tasks_widget import TasksWidget from .delegates import ActionDelegate from . import lib diff --git a/client/ayon_core/tools/launcher/window.py b/client/ayon_core/tools/launcher/window.py index fcc8c0ba38..5c9198ea4a 100644 --- a/client/ayon_core/tools/launcher/window.py +++ b/client/ayon_core/tools/launcher/window.py @@ -3,9 +3,9 @@ import logging from qtpy import QtWidgets, QtCore, QtGui -from openpype import style -from openpype import resources -from openpype.pipeline import AvalonMongoDB +from ayon_core import style +from ayon_core import resources +from ayon_core.pipeline import AvalonMongoDB import qtawesome from .models import ( @@ -22,7 +22,7 @@ from .widgets import ( LauncherTaskWidget ) -from openpype.tools.flickcharm import FlickCharm +from ayon_core.tools.flickcharm import FlickCharm class ProjectIconView(QtWidgets.QListView): diff --git a/client/ayon_core/tools/libraryloader/app.py b/client/ayon_core/tools/libraryloader/app.py index e68e9a5931..abfff2a20d 100644 --- a/client/ayon_core/tools/libraryloader/app.py +++ b/client/ayon_core/tools/libraryloader/app.py @@ -2,20 +2,20 @@ import sys from qtpy import QtWidgets, QtCore, QtGui -from openpype import style -from openpype.client import get_projects, get_project -from openpype.pipeline import AvalonMongoDB -from openpype.tools.utils import lib as tools_lib -from openpype.tools.loader.widgets import ( +from ayon_core import style +from ayon_core.client import get_projects, get_project +from ayon_core.pipeline import AvalonMongoDB +from ayon_core.tools.utils import lib as tools_lib +from ayon_core.tools.loader.widgets import ( ThumbnailWidget, VersionWidget, FamilyListView, RepresentationWidget, SubsetWidget ) -from openpype.tools.utils.assets_widget import MultiSelectAssetsWidget +from ayon_core.tools.utils.assets_widget import MultiSelectAssetsWidget -from openpype.modules import ModulesManager +from ayon_core.modules import ModulesManager module = sys.modules[__name__] module.window = None diff --git a/client/ayon_core/tools/loader/app.py b/client/ayon_core/tools/loader/app.py index b305233247..96ce46db2f 100644 --- a/client/ayon_core/tools/loader/app.py +++ b/client/ayon_core/tools/loader/app.py @@ -3,18 +3,18 @@ import traceback from qtpy import QtWidgets, QtCore -from openpype.client import get_projects, get_project -from openpype import style -from openpype.lib import register_event_callback -from openpype.pipeline import ( +from ayon_core.client import get_projects, get_project +from ayon_core import style +from ayon_core.lib import register_event_callback +from ayon_core.pipeline import ( install_openpype_plugins, legacy_io, ) -from openpype.tools.utils import ( +from ayon_core.tools.utils import ( lib, PlaceholderLineEdit ) -from openpype.tools.utils.assets_widget import MultiSelectAssetsWidget +from ayon_core.tools.utils.assets_widget import MultiSelectAssetsWidget from .widgets import ( SubsetWidget, @@ -25,7 +25,7 @@ from .widgets import ( OverlayFrame ) -from openpype.modules import ModulesManager +from ayon_core.modules import ModulesManager module = sys.modules[__name__] module.window = None diff --git a/client/ayon_core/tools/loader/lib.py b/client/ayon_core/tools/loader/lib.py index d47bc7e07a..654172b551 100644 --- a/client/ayon_core/tools/loader/lib.py +++ b/client/ayon_core/tools/loader/lib.py @@ -2,9 +2,9 @@ import inspect from qtpy import QtGui import qtawesome -from openpype.lib.attribute_definitions import AbstractAttrDef -from openpype.tools.attribute_defs import AttributeDefinitionsDialog -from openpype.tools.utils.widgets import ( +from ayon_core.lib.attribute_definitions import AbstractAttrDef +from ayon_core.tools.attribute_defs import AttributeDefinitionsDialog +from ayon_core.tools.utils.widgets import ( OptionalAction, OptionDialog ) diff --git a/client/ayon_core/tools/loader/model.py b/client/ayon_core/tools/loader/model.py index 69b7e593b1..d1e93345d4 100644 --- a/client/ayon_core/tools/loader/model.py +++ b/client/ayon_core/tools/loader/model.py @@ -7,8 +7,8 @@ from uuid import uuid4 from qtpy import QtCore, QtGui import qtawesome -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_assets, get_subsets, get_last_versions, @@ -17,19 +17,19 @@ from openpype.client import ( get_version_by_name, get_representations ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( registered_host, HeroVersionType, schema, ) -from openpype.style import get_default_entity_icon_color -from openpype.tools.utils.models import TreeModel, Item -from openpype.tools.utils import lib -from openpype.host import ILoadHost +from ayon_core.style import get_default_entity_icon_color +from ayon_core.tools.utils.models import TreeModel, Item +from ayon_core.tools.utils import lib +from ayon_core.host import ILoadHost -from openpype.modules import ModulesManager -from openpype.tools.utils.constants import ( +from ayon_core.modules import ModulesManager +from ayon_core.tools.utils.constants import ( LOCAL_PROVIDER_ROLE, REMOTE_PROVIDER_ROLE, LOCAL_AVAILABILITY_ROLE, diff --git a/client/ayon_core/tools/loader/widgets.py b/client/ayon_core/tools/loader/widgets.py index 5dd3af08d6..071aeeea35 100644 --- a/client/ayon_core/tools/loader/widgets.py +++ b/client/ayon_core/tools/loader/widgets.py @@ -7,7 +7,7 @@ import collections from qtpy import QtWidgets, QtCore, QtGui -from openpype.client import ( +from ayon_core.client import ( get_subset_families, get_subset_by_id, get_subsets, @@ -17,10 +17,10 @@ from openpype.client import ( get_thumbnail_id_from_source, get_thumbnail, ) -from openpype.client.operations import OperationsSession, REMOVED_VALUE -from openpype.pipeline import HeroVersionType, Anatomy -from openpype.pipeline.thumbnail import get_thumbnail_binary -from openpype.pipeline.load import ( +from ayon_core.client.operations import OperationsSession, REMOVED_VALUE +from ayon_core.pipeline import HeroVersionType, Anatomy +from ayon_core.pipeline.thumbnail import get_thumbnail_binary +from ayon_core.pipeline.load import ( discover_loader_plugins, SubsetLoaderPlugin, loaders_from_repre_context, @@ -32,30 +32,30 @@ from openpype.pipeline.load import ( LoadError, IncompatibleLoaderError, ) -from openpype.tools.utils import ( +from ayon_core.tools.utils import ( ErrorMessageBox, lib as tools_lib ) -from openpype.tools.utils.lib import checkstate_int_to_enum -from openpype.tools.utils.delegates import ( +from ayon_core.tools.utils.lib import checkstate_int_to_enum +from ayon_core.tools.utils.delegates import ( VersionDelegate, PrettyTimeDelegate ) -from openpype.tools.utils.widgets import ( +from ayon_core.tools.utils.widgets import ( OptionalMenu, PlaceholderLineEdit ) -from openpype.tools.utils.views import ( +from ayon_core.tools.utils.views import ( TreeViewSpinner, DeselectableTreeView ) -from openpype.tools.utils.constants import ( +from ayon_core.tools.utils.constants import ( LOCAL_PROVIDER_ROLE, REMOTE_PROVIDER_ROLE, LOCAL_AVAILABILITY_ROLE, REMOTE_AVAILABILITY_ROLE, ) -from openpype.tools.assetlinks.widgets import SimpleLinkView +from ayon_core.tools.assetlinks.widgets import SimpleLinkView from .model import ( SubsetsModel, diff --git a/client/ayon_core/tools/project_manager/project_manager/model.py b/client/ayon_core/tools/project_manager/project_manager/model.py index f6c98d6f6c..c77e61ae64 100644 --- a/client/ayon_core/tools/project_manager/project_manager/model.py +++ b/client/ayon_core/tools/project_manager/project_manager/model.py @@ -7,14 +7,14 @@ from pymongo import UpdateOne, DeleteOne from qtpy import QtCore, QtGui -from openpype.client import ( +from ayon_core.client import ( get_projects, get_project, get_assets, get_asset_ids_with_subsets, ) -from openpype.client.operations import CURRENT_ASSET_DOC_SCHEMA -from openpype.lib import Logger +from ayon_core.client.operations import CURRENT_ASSET_DOC_SCHEMA +from ayon_core.lib import Logger from .constants import ( IDENTIFIER_ROLE, diff --git a/client/ayon_core/tools/project_manager/project_manager/multiselection_combobox.py b/client/ayon_core/tools/project_manager/project_manager/multiselection_combobox.py index 4100ada221..0137e60a8b 100644 --- a/client/ayon_core/tools/project_manager/project_manager/multiselection_combobox.py +++ b/client/ayon_core/tools/project_manager/project_manager/multiselection_combobox.py @@ -1,10 +1,10 @@ from qtpy import QtCore, QtWidgets -from openpype.tools.utils.lib import ( +from ayon_core.tools.utils.lib import ( checkstate_int_to_enum, checkstate_enum_to_int, ) -from openpype.tools.utils.constants import ( +from ayon_core.tools.utils.constants import ( CHECKED_INT, UNCHECKED_INT, ITEM_IS_USER_TRISTATE, diff --git a/client/ayon_core/tools/project_manager/project_manager/style.py b/client/ayon_core/tools/project_manager/project_manager/style.py index 6445bc341d..bdd320d3f6 100644 --- a/client/ayon_core/tools/project_manager/project_manager/style.py +++ b/client/ayon_core/tools/project_manager/project_manager/style.py @@ -2,7 +2,7 @@ import os from qtpy import QtGui import qtawesome -from openpype.tools.utils import paint_image_with_color +from ayon_core.tools.utils import paint_image_with_color class ResourceCache: diff --git a/client/ayon_core/tools/project_manager/project_manager/view.py b/client/ayon_core/tools/project_manager/project_manager/view.py index 2cf11b702d..7f716736de 100644 --- a/client/ayon_core/tools/project_manager/project_manager/view.py +++ b/client/ayon_core/tools/project_manager/project_manager/view.py @@ -3,7 +3,7 @@ from queue import Queue from qtpy import QtWidgets, QtCore, QtGui -from openpype.client import get_project +from ayon_core.client import get_project from .delegates import ( NumberDelegate, NameDelegate, @@ -11,7 +11,7 @@ from .delegates import ( ToolsDelegate ) -from openpype.lib import ApplicationManager +from ayon_core.lib import ApplicationManager from .constants import ( REMOVED_ROLE, IDENTIFIER_ROLE, diff --git a/client/ayon_core/tools/project_manager/project_manager/widgets.py b/client/ayon_core/tools/project_manager/project_manager/widgets.py index 3154f777df..7caa7a42e8 100644 --- a/client/ayon_core/tools/project_manager/project_manager/widgets.py +++ b/client/ayon_core/tools/project_manager/project_manager/widgets.py @@ -1,24 +1,24 @@ import re import platform -from openpype.client import get_projects, create_project +from ayon_core.client import get_projects, create_project from .constants import ( NAME_ALLOWED_SYMBOLS, NAME_REGEX ) -from openpype.client.operations import ( +from ayon_core.client.operations import ( PROJECT_NAME_ALLOWED_SYMBOLS, PROJECT_NAME_REGEX, OperationsSession, ) -from openpype.style import load_stylesheet -from openpype.pipeline import AvalonMongoDB -from openpype.tools.utils import ( +from ayon_core.style import load_stylesheet +from ayon_core.pipeline import AvalonMongoDB +from ayon_core.tools.utils import ( PlaceholderLineEdit, get_warning_pixmap, PixmapLabel, ) -from openpype.settings.lib import get_default_anatomy_settings +from ayon_core.settings.lib import get_default_anatomy_settings from qtpy import QtWidgets, QtCore, QtGui diff --git a/client/ayon_core/tools/project_manager/project_manager/window.py b/client/ayon_core/tools/project_manager/project_manager/window.py index 942bdaeec3..3e19f94f38 100644 --- a/client/ayon_core/tools/project_manager/project_manager/window.py +++ b/client/ayon_core/tools/project_manager/project_manager/window.py @@ -1,11 +1,11 @@ from qtpy import QtWidgets, QtCore, QtGui -from openpype import resources -from openpype.style import load_stylesheet -from openpype.widgets import PasswordDialog -from openpype.lib import is_admin_password_required, Logger -from openpype.pipeline import AvalonMongoDB -from openpype.pipeline.project_folders import create_project_folders +from ayon_core import resources +from ayon_core.style import load_stylesheet +from ayon_core.widgets import PasswordDialog +from ayon_core.lib import is_admin_password_required, Logger +from ayon_core.pipeline import AvalonMongoDB +from ayon_core.pipeline.project_folders import create_project_folders from . import ( ProjectModel, diff --git a/client/ayon_core/tools/publisher/control.py b/client/ayon_core/tools/publisher/control.py index 47e374edf2..d72a8f4bee 100644 --- a/client/ayon_core/tools/publisher/control.py +++ b/client/ayon_core/tools/publisher/control.py @@ -13,37 +13,37 @@ import six import arrow import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_assets, get_asset_by_id, get_subsets, get_asset_name_identifier, ) -from openpype.lib.events import EventSystem -from openpype.lib.attribute_definitions import ( +from ayon_core.lib.events import EventSystem +from ayon_core.lib.attribute_definitions import ( UIDef, serialize_attr_defs, deserialize_attr_defs, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( PublishValidationError, KnownPublishError, registered_host, get_process_id, OptionalPyblishPluginMixin, ) -from openpype.pipeline.create import ( +from ayon_core.pipeline.create import ( CreateContext, AutoCreator, HiddenCreator, Creator, ) -from openpype.pipeline.create.context import ( +from ayon_core.pipeline.create.context import ( CreatorsOperationFailed, ConvertorsOperationFailed, ) -from openpype.pipeline.publish import get_publish_instance_label +from ayon_core.pipeline.publish import get_publish_instance_label # Define constant for plugin orders offset PLUGIN_ORDER_OFFSET = 0.5 diff --git a/client/ayon_core/tools/publisher/control_qt.py b/client/ayon_core/tools/publisher/control_qt.py index 132b42f9ec..3d56c08131 100644 --- a/client/ayon_core/tools/publisher/control_qt.py +++ b/client/ayon_core/tools/publisher/control_qt.py @@ -3,8 +3,8 @@ from abc import abstractmethod, abstractproperty from qtpy import QtCore -from openpype.lib.events import Event -from openpype.pipeline.create import CreatedInstance +from ayon_core.lib.events import Event +from ayon_core.pipeline.create import CreatedInstance from .control import ( MainThreadItem, diff --git a/client/ayon_core/tools/publisher/publish_report_viewer/model.py b/client/ayon_core/tools/publisher/publish_report_viewer/model.py index 460a269f1a..9ed1bf555d 100644 --- a/client/ayon_core/tools/publisher/publish_report_viewer/model.py +++ b/client/ayon_core/tools/publisher/publish_report_viewer/model.py @@ -3,7 +3,7 @@ from qtpy import QtCore, QtGui import pyblish.api -from openpype.tools.utils.lib import html_escape +from ayon_core.tools.utils.lib import html_escape from .constants import ( ITEM_ID_ROLE, ITEM_IS_GROUP_ROLE, diff --git a/client/ayon_core/tools/publisher/publish_report_viewer/widgets.py b/client/ayon_core/tools/publisher/publish_report_viewer/widgets.py index 02c9b63a4e..110d84f3a5 100644 --- a/client/ayon_core/tools/publisher/publish_report_viewer/widgets.py +++ b/client/ayon_core/tools/publisher/publish_report_viewer/widgets.py @@ -1,9 +1,9 @@ from math import ceil from qtpy import QtWidgets, QtCore, QtGui -from openpype.widgets.nice_checkbox import NiceCheckbox +from ayon_core.widgets.nice_checkbox import NiceCheckbox -# from openpype.tools.utils import DeselectableTreeView +# from ayon_core.tools.utils import DeselectableTreeView from .constants import ( ITEM_ID_ROLE, ITEM_IS_GROUP_ROLE diff --git a/client/ayon_core/tools/publisher/publish_report_viewer/window.py b/client/ayon_core/tools/publisher/publish_report_viewer/window.py index f9c8c05802..89997021d2 100644 --- a/client/ayon_core/tools/publisher/publish_report_viewer/window.py +++ b/client/ayon_core/tools/publisher/publish_report_viewer/window.py @@ -7,15 +7,15 @@ import appdirs import arrow from qtpy import QtWidgets, QtCore, QtGui -from openpype import style -from openpype.resources import get_openpype_icon_filepath -from openpype.tools import resources -from openpype.tools.utils import ( +from ayon_core import style +from ayon_core.resources import get_openpype_icon_filepath +from ayon_core.tools import resources +from ayon_core.tools.utils import ( IconButton, paint_image_with_color ) -from openpype.tools.utils.delegates import PrettyTimeDelegate +from ayon_core.tools.utils.delegates import PrettyTimeDelegate if __package__: from .widgets import PublishReportViewerWidget diff --git a/client/ayon_core/tools/publisher/widgets/assets_widget.py b/client/ayon_core/tools/publisher/widgets/assets_widget.py index 32be514dd7..8fb3f04267 100644 --- a/client/ayon_core/tools/publisher/widgets/assets_widget.py +++ b/client/ayon_core/tools/publisher/widgets/assets_widget.py @@ -2,13 +2,13 @@ import collections from qtpy import QtWidgets, QtCore, QtGui -from openpype import AYON_SERVER_ENABLED -from openpype.tools.utils import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.tools.utils import ( PlaceholderLineEdit, RecursiveSortFilterProxyModel, get_asset_icon, ) -from openpype.tools.utils.assets_widget import ( +from ayon_core.tools.utils.assets_widget import ( SingleSelectAssetsWidget, ASSET_ID_ROLE, ASSET_NAME_ROLE, diff --git a/client/ayon_core/tools/publisher/widgets/border_label_widget.py b/client/ayon_core/tools/publisher/widgets/border_label_widget.py index e5693368b1..324c70df34 100644 --- a/client/ayon_core/tools/publisher/widgets/border_label_widget.py +++ b/client/ayon_core/tools/publisher/widgets/border_label_widget.py @@ -2,7 +2,7 @@ from qtpy import QtWidgets, QtCore, QtGui -from openpype.style import get_objected_colors +from ayon_core.style import get_objected_colors class _VLineWidget(QtWidgets.QWidget): diff --git a/client/ayon_core/tools/publisher/widgets/card_view_widgets.py b/client/ayon_core/tools/publisher/widgets/card_view_widgets.py index 5cdd429cd4..316bc9fc56 100644 --- a/client/ayon_core/tools/publisher/widgets/card_view_widgets.py +++ b/client/ayon_core/tools/publisher/widgets/card_view_widgets.py @@ -25,10 +25,10 @@ import collections from qtpy import QtWidgets, QtCore -from openpype.widgets.nice_checkbox import NiceCheckbox +from ayon_core.widgets.nice_checkbox import NiceCheckbox -from openpype.tools.utils import BaseClickableFrame -from openpype.tools.utils.lib import html_escape +from ayon_core.tools.utils import BaseClickableFrame +from ayon_core.tools.utils.lib import html_escape from .widgets import ( AbstractInstanceView, ContextWarningLabel, diff --git a/client/ayon_core/tools/publisher/widgets/create_widget.py b/client/ayon_core/tools/publisher/widgets/create_widget.py index 73dcae51a5..1bfeb572b7 100644 --- a/client/ayon_core/tools/publisher/widgets/create_widget.py +++ b/client/ayon_core/tools/publisher/widgets/create_widget.py @@ -2,8 +2,8 @@ import re from qtpy import QtWidgets, QtCore, QtGui -from openpype import AYON_SERVER_ENABLED -from openpype.pipeline.create import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.pipeline.create import ( SUBSET_NAME_ALLOWED_SYMBOLS, PRE_CREATE_THUMBNAIL_KEY, DEFAULT_VARIANT_VALUE, diff --git a/client/ayon_core/tools/publisher/widgets/list_view_widgets.py b/client/ayon_core/tools/publisher/widgets/list_view_widgets.py index 3370f71701..321be27b04 100644 --- a/client/ayon_core/tools/publisher/widgets/list_view_widgets.py +++ b/client/ayon_core/tools/publisher/widgets/list_view_widgets.py @@ -26,9 +26,9 @@ import collections from qtpy import QtWidgets, QtCore, QtGui -from openpype.style import get_objected_colors -from openpype.widgets.nice_checkbox import NiceCheckbox -from openpype.tools.utils.lib import html_escape, checkstate_int_to_enum +from ayon_core.style import get_objected_colors +from ayon_core.widgets.nice_checkbox import NiceCheckbox +from ayon_core.tools.utils.lib import html_escape, checkstate_int_to_enum from .widgets import AbstractInstanceView from ..constants import ( INSTANCE_ID_ROLE, diff --git a/client/ayon_core/tools/publisher/widgets/overview_widget.py b/client/ayon_core/tools/publisher/widgets/overview_widget.py index 10151250f6..31b8bb4558 100644 --- a/client/ayon_core/tools/publisher/widgets/overview_widget.py +++ b/client/ayon_core/tools/publisher/widgets/overview_widget.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets, QtCore -from openpype import AYON_SERVER_ENABLED +from ayon_core import AYON_SERVER_ENABLED from .border_label_widget import BorderedLabelWidget diff --git a/client/ayon_core/tools/publisher/widgets/precreate_widget.py b/client/ayon_core/tools/publisher/widgets/precreate_widget.py index 3bf0bc3657..ae0deb8410 100644 --- a/client/ayon_core/tools/publisher/widgets/precreate_widget.py +++ b/client/ayon_core/tools/publisher/widgets/precreate_widget.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets, QtCore -from openpype.tools.attribute_defs import create_widget_for_attr_def +from ayon_core.tools.attribute_defs import create_widget_for_attr_def from ..constants import INPUTS_LAYOUT_HSPACING, INPUTS_LAYOUT_VSPACING diff --git a/client/ayon_core/tools/publisher/widgets/report_page.py b/client/ayon_core/tools/publisher/widgets/report_page.py index 50a619f0a8..c4a37da887 100644 --- a/client/ayon_core/tools/publisher/widgets/report_page.py +++ b/client/ayon_core/tools/publisher/widgets/report_page.py @@ -9,8 +9,8 @@ except Exception: from qtpy import QtWidgets, QtCore, QtGui -from openpype.style import get_objected_colors -from openpype.tools.utils import ( +from ayon_core.style import get_objected_colors +from ayon_core.tools.utils import ( BaseClickableFrame, ClickableFrame, ExpandingTextEdit, diff --git a/client/ayon_core/tools/publisher/widgets/tabs_widget.py b/client/ayon_core/tools/publisher/widgets/tabs_widget.py index 4b87b76178..e484dc8681 100644 --- a/client/ayon_core/tools/publisher/widgets/tabs_widget.py +++ b/client/ayon_core/tools/publisher/widgets/tabs_widget.py @@ -1,5 +1,5 @@ from qtpy import QtWidgets, QtCore -from openpype.tools.utils import set_style_property +from ayon_core.tools.utils import set_style_property class PublisherTabBtn(QtWidgets.QPushButton): diff --git a/client/ayon_core/tools/publisher/widgets/tasks_widget.py b/client/ayon_core/tools/publisher/widgets/tasks_widget.py index 1b1ddd0c7d..44e290408a 100644 --- a/client/ayon_core/tools/publisher/widgets/tasks_widget.py +++ b/client/ayon_core/tools/publisher/widgets/tasks_widget.py @@ -1,7 +1,7 @@ from qtpy import QtCore, QtGui -from openpype.tools.utils.tasks_widget import TasksWidget, TASK_NAME_ROLE -from openpype.tools.utils.lib import get_default_task_icon +from ayon_core.tools.utils.tasks_widget import TasksWidget, TASK_NAME_ROLE +from ayon_core.tools.utils.lib import get_default_task_icon class TasksModel(QtGui.QStandardItemModel): diff --git a/client/ayon_core/tools/publisher/widgets/thumbnail_widget.py b/client/ayon_core/tools/publisher/widgets/thumbnail_widget.py index 60970710d8..07dc532534 100644 --- a/client/ayon_core/tools/publisher/widgets/thumbnail_widget.py +++ b/client/ayon_core/tools/publisher/widgets/thumbnail_widget.py @@ -3,23 +3,23 @@ import uuid from qtpy import QtWidgets, QtCore, QtGui -from openpype.style import get_objected_colors -from openpype.lib import ( +from ayon_core.style import get_objected_colors +from ayon_core.lib import ( run_subprocess, is_oiio_supported, get_oiio_tool_args, get_ffmpeg_tool_args, ) -from openpype.lib.transcoding import ( +from ayon_core.lib.transcoding import ( IMAGE_EXTENSIONS, VIDEO_EXTENSIONS, ) -from openpype.tools.utils import ( +from ayon_core.tools.utils import ( paint_image_with_color, PixmapButton, ) -from openpype.tools.publisher.control import CardMessageTypes +from ayon_core.tools.publisher.control import CardMessageTypes from .icons import get_image from .screenshot_widget import capture_to_file diff --git a/client/ayon_core/tools/publisher/widgets/widgets.py b/client/ayon_core/tools/publisher/widgets/widgets.py index ecccc4e0c8..fd9943c566 100644 --- a/client/ayon_core/tools/publisher/widgets/widgets.py +++ b/client/ayon_core/tools/publisher/widgets/widgets.py @@ -9,20 +9,20 @@ import collections from qtpy import QtWidgets, QtCore, QtGui import qtawesome -from openpype import AYON_SERVER_ENABLED -from openpype.lib.attribute_definitions import UnknownDef -from openpype.tools.attribute_defs import create_widget_for_attr_def -from openpype.tools import resources -from openpype.tools.flickcharm import FlickCharm -from openpype.tools.utils import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.lib.attribute_definitions import UnknownDef +from ayon_core.tools.attribute_defs import create_widget_for_attr_def +from ayon_core.tools import resources +from ayon_core.tools.flickcharm import FlickCharm +from ayon_core.tools.utils import ( PlaceholderLineEdit, IconButton, PixmapLabel, BaseClickableFrame, set_style_property, ) -from openpype.style import get_objected_colors -from openpype.pipeline.create import ( +from ayon_core.style import get_objected_colors +from ayon_core.pipeline.create import ( SUBSET_NAME_ALLOWED_SYMBOLS, TaskNotSetError, ) diff --git a/client/ayon_core/tools/publisher/window.py b/client/ayon_core/tools/publisher/window.py index 5dd6998b24..6772fdda80 100644 --- a/client/ayon_core/tools/publisher/window.py +++ b/client/ayon_core/tools/publisher/window.py @@ -5,18 +5,18 @@ import collections import copy from qtpy import QtWidgets, QtCore, QtGui -from openpype import ( +from ayon_core import ( resources, style ) -from openpype import AYON_SERVER_ENABLED -from openpype.tools.utils import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.tools.utils import ( ErrorMessageBox, PlaceholderLineEdit, MessageOverlayObject, PixmapLabel, ) -from openpype.tools.utils.lib import center_window +from ayon_core.tools.utils.lib import center_window from .constants import ResetKeySequence from .publish_report_viewer import PublishReportViewerWidget diff --git a/client/ayon_core/tools/push_to_project/app.py b/client/ayon_core/tools/push_to_project/app.py index b3ec33f353..c734063750 100644 --- a/client/ayon_core/tools/push_to_project/app.py +++ b/client/ayon_core/tools/push_to_project/app.py @@ -1,7 +1,7 @@ import click -from openpype.tools.utils import get_openpype_qt_app -from openpype.tools.push_to_project.window import PushToContextSelectWindow +from ayon_core.tools.utils import get_openpype_qt_app +from ayon_core.tools.push_to_project.window import PushToContextSelectWindow @click.command() diff --git a/client/ayon_core/tools/push_to_project/control_context.py b/client/ayon_core/tools/push_to_project/control_context.py index e4058893d5..517d92159b 100644 --- a/client/ayon_core/tools/push_to_project/control_context.py +++ b/client/ayon_core/tools/push_to_project/control_context.py @@ -2,7 +2,7 @@ import re import collections import threading -from openpype.client import ( +from ayon_core.client import ( get_projects, get_assets, get_asset_by_id, @@ -10,10 +10,10 @@ from openpype.client import ( get_version_by_id, get_representations, ) -from openpype.settings import get_project_settings -from openpype.lib import prepare_template_data -from openpype.lib.events import EventSystem -from openpype.pipeline.create import ( +from ayon_core.settings import get_project_settings +from ayon_core.lib import prepare_template_data +from ayon_core.lib.events import EventSystem +from ayon_core.pipeline.create import ( SUBSET_NAME_ALLOWED_SYMBOLS, get_subset_name_template, ) diff --git a/client/ayon_core/tools/push_to_project/control_integrate.py b/client/ayon_core/tools/push_to_project/control_integrate.py index 9f083d8eb7..eb8f867650 100644 --- a/client/ayon_core/tools/push_to_project/control_integrate.py +++ b/client/ayon_core/tools/push_to_project/control_integrate.py @@ -9,7 +9,7 @@ import traceback from bson.objectid import ObjectId -from openpype.client import ( +from ayon_core.client import ( get_project, get_assets, get_asset_by_id, @@ -20,7 +20,7 @@ from openpype.client import ( get_version_by_name, get_representations, ) -from openpype.client.operations import ( +from ayon_core.client.operations import ( OperationsSession, new_asset_document, new_subset_document, @@ -29,21 +29,21 @@ from openpype.client.operations import ( prepare_version_update_data, prepare_representation_update_data, ) -from openpype.modules import ModulesManager -from openpype.lib import ( +from ayon_core.modules import ModulesManager +from ayon_core.lib import ( StringTemplate, get_openpype_username, get_formatted_current_time, source_hash, ) -from openpype.lib.file_transaction import FileTransaction -from openpype.settings import get_project_settings -from openpype.pipeline import Anatomy -from openpype.pipeline.version_start import get_versioning_start -from openpype.pipeline.template_data import get_template_data -from openpype.pipeline.publish import get_publish_template_name -from openpype.pipeline.create import get_subset_name +from ayon_core.lib.file_transaction import FileTransaction +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import Anatomy +from ayon_core.pipeline.version_start import get_versioning_start +from ayon_core.pipeline.template_data import get_template_data +from ayon_core.pipeline.publish import get_publish_template_name +from ayon_core.pipeline.create import get_subset_name UNKNOWN = object() diff --git a/client/ayon_core/tools/push_to_project/window.py b/client/ayon_core/tools/push_to_project/window.py index c0c47fd40e..e3c49f8e89 100644 --- a/client/ayon_core/tools/push_to_project/window.py +++ b/client/ayon_core/tools/push_to_project/window.py @@ -2,14 +2,14 @@ import collections from qtpy import QtWidgets, QtGui, QtCore -from openpype.style import load_stylesheet, get_app_icon_path -from openpype.tools.utils import ( +from ayon_core.style import load_stylesheet, get_app_icon_path +from ayon_core.tools.utils import ( PlaceholderLineEdit, SeparatorWidget, get_asset_icon_by_name, set_style_property, ) -from openpype.tools.utils.views import DeselectableTreeView +from ayon_core.tools.utils.views import DeselectableTreeView from .control_context import PushToContextController diff --git a/client/ayon_core/tools/pyblish_pype/control.py b/client/ayon_core/tools/pyblish_pype/control.py index f8c6a3e0bc..1a3e7a15f0 100644 --- a/client/ayon_core/tools/pyblish_pype/control.py +++ b/client/ayon_core/tools/pyblish_pype/control.py @@ -22,7 +22,7 @@ import pyblish.version from . import util from .constants import InstanceStates -from openpype.settings import get_current_project_settings +from ayon_core.settings import get_current_project_settings class IterationBreak(Exception): diff --git a/client/ayon_core/tools/pyblish_pype/model.py b/client/ayon_core/tools/pyblish_pype/model.py index 8a07bb447a..4c91fb567f 100644 --- a/client/ayon_core/tools/pyblish_pype/model.py +++ b/client/ayon_core/tools/pyblish_pype/model.py @@ -34,7 +34,7 @@ import qtawesome from six import text_type from .constants import PluginStates, InstanceStates, GroupStates, Roles -from openpype.settings import get_system_settings +from ayon_core.settings import get_system_settings # ItemTypes diff --git a/client/ayon_core/tools/sceneinventory/model.py b/client/ayon_core/tools/sceneinventory/model.py index 4fd82f04a4..09078950e5 100644 --- a/client/ayon_core/tools/sceneinventory/model.py +++ b/client/ayon_core/tools/sceneinventory/model.py @@ -6,23 +6,23 @@ from collections import defaultdict from qtpy import QtCore, QtGui import qtawesome -from openpype.host import ILoadHost -from openpype.client import ( +from ayon_core.host import ILoadHost +from ayon_core.client import ( get_asset_by_id, get_subset_by_id, get_version_by_id, get_last_version_by_subset_id, get_representation_by_id, ) -from openpype.pipeline import ( +from ayon_core.pipeline import ( get_current_project_name, schema, HeroVersionType, registered_host, ) -from openpype.style import get_default_entity_icon_color -from openpype.tools.utils.models import TreeModel, Item -from openpype.modules import ModulesManager +from ayon_core.style import get_default_entity_icon_color +from ayon_core.tools.utils.models import TreeModel, Item +from ayon_core.modules import ModulesManager from .lib import walk_hierarchy diff --git a/client/ayon_core/tools/sceneinventory/switch_dialog.py b/client/ayon_core/tools/sceneinventory/switch_dialog.py index 695f47b4d4..34d7c9f3a3 100644 --- a/client/ayon_core/tools/sceneinventory/switch_dialog.py +++ b/client/ayon_core/tools/sceneinventory/switch_dialog.py @@ -3,7 +3,7 @@ import logging from qtpy import QtWidgets, QtCore import qtawesome -from openpype.client import ( +from ayon_core.client import ( get_asset_by_name, get_assets, get_subset_by_name, @@ -13,8 +13,8 @@ from openpype.client import ( get_last_versions, get_representations, ) -from openpype.pipeline import legacy_io -from openpype.pipeline.load import ( +from ayon_core.pipeline import legacy_io +from ayon_core.pipeline.load import ( discover_loader_plugins, switch_container, get_repres_contexts, diff --git a/client/ayon_core/tools/sceneinventory/view.py b/client/ayon_core/tools/sceneinventory/view.py index af463e4867..14afb3a379 100644 --- a/client/ayon_core/tools/sceneinventory/view.py +++ b/client/ayon_core/tools/sceneinventory/view.py @@ -6,23 +6,23 @@ from functools import partial from qtpy import QtWidgets, QtCore import qtawesome -from openpype.client import ( +from ayon_core.client import ( get_version_by_id, get_versions, get_hero_versions, get_representation_by_id, get_representations, ) -from openpype import style -from openpype.pipeline import ( +from ayon_core import style +from ayon_core.pipeline import ( legacy_io, HeroVersionType, update_container, remove_container, discover_inventory_actions, ) -from openpype.modules import ModulesManager -from openpype.tools.utils.lib import ( +from ayon_core.modules import ModulesManager +from ayon_core.tools.utils.lib import ( iter_model_rows, format_version ) diff --git a/client/ayon_core/tools/sceneinventory/widgets.py b/client/ayon_core/tools/sceneinventory/widgets.py index 49b0dd407d..76de044d52 100644 --- a/client/ayon_core/tools/sceneinventory/widgets.py +++ b/client/ayon_core/tools/sceneinventory/widgets.py @@ -1,5 +1,5 @@ from qtpy import QtWidgets, QtCore -from openpype import style +from ayon_core import style class ButtonWithMenu(QtWidgets.QToolButton): diff --git a/client/ayon_core/tools/sceneinventory/window.py b/client/ayon_core/tools/sceneinventory/window.py index 6ee1c0d38e..a31834fbfb 100644 --- a/client/ayon_core/tools/sceneinventory/window.py +++ b/client/ayon_core/tools/sceneinventory/window.py @@ -4,11 +4,11 @@ import sys from qtpy import QtWidgets, QtCore import qtawesome -from openpype import style -from openpype.client import get_projects -from openpype.pipeline import legacy_io -from openpype.tools.utils.delegates import VersionDelegate -from openpype.tools.utils.lib import ( +from ayon_core import style +from ayon_core.client import get_projects +from ayon_core.pipeline import legacy_io +from ayon_core.tools.utils.delegates import VersionDelegate +from ayon_core.tools.utils.lib import ( qt_app_context, preserve_expanded_rows, preserve_selection, diff --git a/client/ayon_core/tools/settings/__init__.py b/client/ayon_core/tools/settings/__init__.py index 04f64e13f1..593f50712c 100644 --- a/client/ayon_core/tools/settings/__init__.py +++ b/client/ayon_core/tools/settings/__init__.py @@ -1,8 +1,8 @@ import sys from qtpy import QtGui -from openpype import style -from openpype.tools.utils import get_openpype_qt_app +from ayon_core import style +from ayon_core.tools.utils import get_openpype_qt_app from .lib import ( BTN_FIXED_SIZE, CHILD_OFFSET diff --git a/client/ayon_core/tools/settings/local_settings/apps_widget.py b/client/ayon_core/tools/settings/local_settings/apps_widget.py index ce1fc86c32..6ac4827607 100644 --- a/client/ayon_core/tools/settings/local_settings/apps_widget.py +++ b/client/ayon_core/tools/settings/local_settings/apps_widget.py @@ -4,8 +4,8 @@ from .widgets import ( Separator, ExpandingWidget ) -from openpype.tools.settings import CHILD_OFFSET -from openpype.tools.utils import PlaceholderLineEdit +from ayon_core.tools.settings import CHILD_OFFSET +from ayon_core.tools.utils import PlaceholderLineEdit class AppVariantWidget(QtWidgets.QWidget): diff --git a/client/ayon_core/tools/settings/local_settings/environments_widget.py b/client/ayon_core/tools/settings/local_settings/environments_widget.py index 5008f086d2..4624837ffd 100644 --- a/client/ayon_core/tools/settings/local_settings/environments_widget.py +++ b/client/ayon_core/tools/settings/local_settings/environments_widget.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets -from openpype.tools.utils import PlaceholderLineEdit +from ayon_core.tools.utils import PlaceholderLineEdit class LocalEnvironmentsWidgets(QtWidgets.QWidget): diff --git a/client/ayon_core/tools/settings/local_settings/experimental_widget.py b/client/ayon_core/tools/settings/local_settings/experimental_widget.py index b0d9381663..07f3a00285 100644 --- a/client/ayon_core/tools/settings/local_settings/experimental_widget.py +++ b/client/ayon_core/tools/settings/local_settings/experimental_widget.py @@ -1,5 +1,5 @@ from qtpy import QtWidgets -from openpype.tools.experimental_tools import ( +from ayon_core.tools.experimental_tools import ( ExperimentalTools, LOCAL_EXPERIMENTAL_KEY ) diff --git a/client/ayon_core/tools/settings/local_settings/general_widget.py b/client/ayon_core/tools/settings/local_settings/general_widget.py index 5a75c219dc..22d0dec4e2 100644 --- a/client/ayon_core/tools/settings/local_settings/general_widget.py +++ b/client/ayon_core/tools/settings/local_settings/general_widget.py @@ -1,9 +1,9 @@ import getpass from qtpy import QtWidgets, QtCore -from openpype.lib import is_admin_password_required -from openpype.widgets import PasswordDialog -from openpype.tools.utils import PlaceholderLineEdit +from ayon_core.lib import is_admin_password_required +from ayon_core.widgets import PasswordDialog +from ayon_core.tools.utils import PlaceholderLineEdit class LocalGeneralWidgets(QtWidgets.QWidget): diff --git a/client/ayon_core/tools/settings/local_settings/mongo_widget.py b/client/ayon_core/tools/settings/local_settings/mongo_widget.py index 9549d6eb17..57aa45f271 100644 --- a/client/ayon_core/tools/settings/local_settings/mongo_widget.py +++ b/client/ayon_core/tools/settings/local_settings/mongo_widget.py @@ -5,8 +5,8 @@ import traceback from qtpy import QtWidgets from pymongo.errors import ServerSelectionTimeoutError -from openpype.lib import change_openpype_mongo_url -from openpype.tools.utils import PlaceholderLineEdit +from ayon_core.lib import change_openpype_mongo_url +from ayon_core.tools.utils import PlaceholderLineEdit class OpenPypeMongoWidget(QtWidgets.QWidget): diff --git a/client/ayon_core/tools/settings/local_settings/projects_widget.py b/client/ayon_core/tools/settings/local_settings/projects_widget.py index f2b6535115..814b4b72fd 100644 --- a/client/ayon_core/tools/settings/local_settings/projects_widget.py +++ b/client/ayon_core/tools/settings/local_settings/projects_widget.py @@ -1,9 +1,9 @@ import platform import copy from qtpy import QtWidgets, QtCore, QtGui -from openpype.tools.settings.settings import ProjectListWidget -from openpype.tools.utils import PlaceholderLineEdit -from openpype.settings.constants import ( +from ayon_core.tools.settings.settings import ProjectListWidget +from ayon_core.tools.utils import PlaceholderLineEdit +from ayon_core.settings.constants import ( PROJECT_ANATOMY_KEY, DEFAULT_PROJECT_KEY ) diff --git a/client/ayon_core/tools/settings/local_settings/widgets.py b/client/ayon_core/tools/settings/local_settings/widgets.py index f40978a66f..99b25072a1 100644 --- a/client/ayon_core/tools/settings/local_settings/widgets.py +++ b/client/ayon_core/tools/settings/local_settings/widgets.py @@ -1,5 +1,5 @@ from qtpy import QtWidgets, QtCore -from openpype.tools.settings.settings.widgets import ( +from ayon_core.tools.settings.settings.widgets import ( ExpandingWidget ) diff --git a/client/ayon_core/tools/settings/local_settings/window.py b/client/ayon_core/tools/settings/local_settings/window.py index fdb05e219f..9c8f025c7c 100644 --- a/client/ayon_core/tools/settings/local_settings/window.py +++ b/client/ayon_core/tools/settings/local_settings/window.py @@ -1,19 +1,19 @@ from qtpy import QtWidgets, QtGui -from openpype import style +from ayon_core import style -from openpype.settings import ( +from ayon_core.settings import ( SystemSettings, ProjectSettings ) -from openpype.settings.lib import ( +from ayon_core.settings.lib import ( get_local_settings, save_local_settings ) -from openpype.lib import Logger -from openpype.tools.settings import CHILD_OFFSET -from openpype.tools.utils import MessageOverlayObject -from openpype.modules import ModulesManager +from ayon_core.lib import Logger +from ayon_core.tools.settings import CHILD_OFFSET +from ayon_core.tools.utils import MessageOverlayObject +from ayon_core.modules import ModulesManager from .widgets import ( ExpandingWidget diff --git a/client/ayon_core/tools/settings/settings/base.py b/client/ayon_core/tools/settings/settings/base.py index 074ecdae90..0ca495cfe7 100644 --- a/client/ayon_core/tools/settings/settings/base.py +++ b/client/ayon_core/tools/settings/settings/base.py @@ -7,8 +7,8 @@ import datetime from qtpy import QtWidgets, QtGui, QtCore -from openpype.settings.entities import ProjectSettings -from openpype.tools.settings import CHILD_OFFSET +from ayon_core.settings.entities import ProjectSettings +from ayon_core.tools.settings import CHILD_OFFSET from .widgets import ExpandingWidget from .lib import create_deffered_value_change_timer diff --git a/client/ayon_core/tools/settings/settings/categories.py b/client/ayon_core/tools/settings/settings/categories.py index 2e5ce496ed..2ce259fd7a 100644 --- a/client/ayon_core/tools/settings/settings/categories.py +++ b/client/ayon_core/tools/settings/settings/categories.py @@ -5,9 +5,9 @@ from enum import Enum from qtpy import QtWidgets, QtCore import qtawesome -from openpype.lib import get_openpype_version -from openpype.tools.utils import set_style_property -from openpype.settings.entities import ( +from ayon_core.lib import get_openpype_version +from ayon_core.tools.utils import set_style_property +from ayon_core.settings.entities import ( SystemSettings, ProjectSettings, @@ -31,12 +31,12 @@ from openpype.settings.entities import ( StudioDefaultsNotDefined, SchemaError ) -from openpype.settings.entities.op_version_entity import ( +from ayon_core.settings.entities.op_version_entity import ( OpenPypeVersionInput ) -from openpype.settings import SaveWarningExc -from openpype.settings.lib import ( +from ayon_core.settings import SaveWarningExc +from ayon_core.settings.lib import ( get_system_last_saved_info, get_project_last_saved_info, ) diff --git a/client/ayon_core/tools/settings/settings/color_widget.py b/client/ayon_core/tools/settings/settings/color_widget.py index 819bfb3581..2e8aeb7461 100644 --- a/client/ayon_core/tools/settings/settings/color_widget.py +++ b/client/ayon_core/tools/settings/settings/color_widget.py @@ -2,7 +2,7 @@ from qtpy import QtWidgets, QtCore, QtGui from .item_widgets import InputWidget -from openpype.widgets.color_widgets import ( +from ayon_core.widgets.color_widgets import ( ColorPickerWidget, draw_checkerboard_tile ) diff --git a/client/ayon_core/tools/settings/settings/dialogs.py b/client/ayon_core/tools/settings/settings/dialogs.py index 38da3cf881..44d939d26f 100644 --- a/client/ayon_core/tools/settings/settings/dialogs.py +++ b/client/ayon_core/tools/settings/settings/dialogs.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets, QtCore -from openpype.tools.utils.delegates import pretty_date +from ayon_core.tools.utils.delegates import pretty_date class BaseInfoDialog(QtWidgets.QDialog): diff --git a/client/ayon_core/tools/settings/settings/dict_conditional.py b/client/ayon_core/tools/settings/settings/dict_conditional.py index 564603b258..992abe4fba 100644 --- a/client/ayon_core/tools/settings/settings/dict_conditional.py +++ b/client/ayon_core/tools/settings/settings/dict_conditional.py @@ -10,7 +10,7 @@ from .wrapper_widgets import ( FormWrapper ) from .base import BaseWidget -from openpype.tools.settings import CHILD_OFFSET +from ayon_core.tools.settings import CHILD_OFFSET class DictConditionalWidget(BaseWidget): diff --git a/client/ayon_core/tools/settings/settings/dict_mutable_widget.py b/client/ayon_core/tools/settings/settings/dict_mutable_widget.py index 27c9392320..a2a4e3a078 100644 --- a/client/ayon_core/tools/settings/settings/dict_mutable_widget.py +++ b/client/ayon_core/tools/settings/settings/dict_mutable_widget.py @@ -13,11 +13,11 @@ from .widgets import ( ExpandingWidget, IconButton ) -from openpype.tools.settings import ( +from ayon_core.tools.settings import ( BTN_FIXED_SIZE, CHILD_OFFSET ) -from openpype.settings.constants import KEY_REGEX +from ayon_core.settings.constants import KEY_REGEX KEY_INPUT_TOOLTIP = ( diff --git a/client/ayon_core/tools/settings/settings/item_widgets.py b/client/ayon_core/tools/settings/settings/item_widgets.py index 2fd13cbbd8..7490b1f1d2 100644 --- a/client/ayon_core/tools/settings/settings/item_widgets.py +++ b/client/ayon_core/tools/settings/settings/item_widgets.py @@ -2,10 +2,10 @@ import json from qtpy import QtWidgets, QtCore, QtGui -from openpype.widgets.sliders import NiceSlider -from openpype.tools.settings import CHILD_OFFSET -from openpype.tools.utils import MultiSelectionComboBox -from openpype.settings.entities.exceptions import BaseInvalidValue +from ayon_core.widgets.sliders import NiceSlider +from ayon_core.tools.settings import CHILD_OFFSET +from ayon_core.tools.utils import MultiSelectionComboBox +from ayon_core.settings.entities.exceptions import BaseInvalidValue from .widgets import ( ExpandingWidget, diff --git a/client/ayon_core/tools/settings/settings/list_item_widget.py b/client/ayon_core/tools/settings/settings/list_item_widget.py index 67ce4b9dc9..515d7d503d 100644 --- a/client/ayon_core/tools/settings/settings/list_item_widget.py +++ b/client/ayon_core/tools/settings/settings/list_item_widget.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets, QtCore -from openpype.tools.settings import ( +from ayon_core.tools.settings import ( CHILD_OFFSET ) diff --git a/client/ayon_core/tools/settings/settings/widgets.py b/client/ayon_core/tools/settings/settings/widgets.py index 092b6f0e51..e730c626d6 100644 --- a/client/ayon_core/tools/settings/settings/widgets.py +++ b/client/ayon_core/tools/settings/settings/widgets.py @@ -3,18 +3,18 @@ import uuid from qtpy import QtWidgets, QtCore, QtGui import qtawesome -from openpype.client import get_projects -from openpype.style import get_objected_colors -from openpype.tools.utils.widgets import ImageButton -from openpype.tools.utils.lib import paint_image_with_color +from ayon_core.client import get_projects +from ayon_core.style import get_objected_colors +from ayon_core.tools.utils.widgets import ImageButton +from ayon_core.tools.utils.lib import paint_image_with_color -from openpype.widgets.nice_checkbox import NiceCheckbox -from openpype.tools.utils import ( +from ayon_core.widgets.nice_checkbox import NiceCheckbox +from ayon_core.tools.utils import ( PlaceholderLineEdit, DynamicQThread ) -from openpype.settings.lib import find_closest_version_for_projects -from openpype.lib import get_openpype_version +from ayon_core.settings.lib import find_closest_version_for_projects +from ayon_core.lib import get_openpype_version from .images import ( get_pixmap, get_image diff --git a/client/ayon_core/tools/settings/settings/window.py b/client/ayon_core/tools/settings/settings/window.py index f479908f7b..0329b2f1bd 100644 --- a/client/ayon_core/tools/settings/settings/window.py +++ b/client/ayon_core/tools/settings/settings/window.py @@ -1,12 +1,12 @@ from qtpy import QtWidgets, QtGui, QtCore -from openpype import style +from ayon_core import style -from openpype.lib import is_admin_password_required -from openpype.lib.events import EventSystem -from openpype.widgets import PasswordDialog +from ayon_core.lib import is_admin_password_required +from ayon_core.lib.events import EventSystem +from ayon_core.widgets import PasswordDialog -from openpype.settings.lib import ( +from ayon_core.settings.lib import ( get_last_opened_info, opened_settings_ui, closed_settings_ui, diff --git a/client/ayon_core/tools/settings/settings/wrapper_widgets.py b/client/ayon_core/tools/settings/settings/wrapper_widgets.py index 0b45a9a01b..8f3988dad3 100644 --- a/client/ayon_core/tools/settings/settings/wrapper_widgets.py +++ b/client/ayon_core/tools/settings/settings/wrapper_widgets.py @@ -5,7 +5,7 @@ from .widgets import ( ExpandingWidget, GridLabelWidget ) -from openpype.tools.settings import CHILD_OFFSET +from ayon_core.tools.settings import CHILD_OFFSET class WrapperWidget(QtWidgets.QWidget): diff --git a/client/ayon_core/tools/standalonepublish/app.py b/client/ayon_core/tools/standalonepublish/app.py index d71c205c3b..428cd1d2bb 100644 --- a/client/ayon_core/tools/standalonepublish/app.py +++ b/client/ayon_core/tools/standalonepublish/app.py @@ -6,16 +6,16 @@ import signal from bson.objectid import ObjectId from qtpy import QtWidgets, QtCore, QtGui -from openpype.client import get_asset_by_id +from ayon_core.client import get_asset_by_id from .widgets import ( AssetWidget, FamilyWidget, ComponentsWidget, ShadowWidget ) from .widgets.constants import HOST_NAME -from openpype import style -from openpype import resources -from openpype.pipeline import AvalonMongoDB -from openpype.modules import ModulesManager +from ayon_core import style +from ayon_core import resources +from ayon_core.pipeline import AvalonMongoDB +from ayon_core.modules import ModulesManager class Window(QtWidgets.QDialog): diff --git a/client/ayon_core/tools/standalonepublish/publish.py b/client/ayon_core/tools/standalonepublish/publish.py index e1e9edebb9..08c95228cd 100644 --- a/client/ayon_core/tools/standalonepublish/publish.py +++ b/client/ayon_core/tools/standalonepublish/publish.py @@ -2,8 +2,8 @@ import os import sys import pyblish.api -from openpype.pipeline import install_openpype_plugins -from openpype.tools.utils.host_tools import show_publish +from ayon_core.pipeline import install_openpype_plugins +from ayon_core.tools.utils.host_tools import show_publish def main(env): diff --git a/client/ayon_core/tools/standalonepublish/widgets/model_asset.py b/client/ayon_core/tools/standalonepublish/widgets/model_asset.py index 2f67036e78..003c2b106f 100644 --- a/client/ayon_core/tools/standalonepublish/widgets/model_asset.py +++ b/client/ayon_core/tools/standalonepublish/widgets/model_asset.py @@ -4,8 +4,8 @@ import collections from qtpy import QtCore, QtGui import qtawesome -from openpype.client import get_assets -from openpype.style import ( +from ayon_core.client import get_assets +from ayon_core.style import ( get_default_entity_icon_color, get_deprecated_entity_font_color, ) diff --git a/client/ayon_core/tools/standalonepublish/widgets/model_tasks_template.py b/client/ayon_core/tools/standalonepublish/widgets/model_tasks_template.py index e22a4e3bf8..5c2f282304 100644 --- a/client/ayon_core/tools/standalonepublish/widgets/model_tasks_template.py +++ b/client/ayon_core/tools/standalonepublish/widgets/model_tasks_template.py @@ -1,7 +1,7 @@ from qtpy import QtCore import qtawesome -from openpype.style import get_default_entity_icon_color +from ayon_core.style import get_default_entity_icon_color from . import Node, TreeModel diff --git a/client/ayon_core/tools/standalonepublish/widgets/widget_asset.py b/client/ayon_core/tools/standalonepublish/widgets/widget_asset.py index 669366dd1d..5ccd54398a 100644 --- a/client/ayon_core/tools/standalonepublish/widgets/widget_asset.py +++ b/client/ayon_core/tools/standalonepublish/widgets/widget_asset.py @@ -2,15 +2,15 @@ import contextlib from qtpy import QtWidgets, QtCore import qtawesome -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_projects, get_project, get_asset_by_id, ) -from openpype.tools.utils import PlaceholderLineEdit +from ayon_core.tools.utils import PlaceholderLineEdit -from openpype.style import get_default_tools_icon_color +from ayon_core.style import get_default_tools_icon_color from . import RecursiveSortFilterProxyModel, AssetModel from . import TasksTemplateModel, DeselectableTreeView diff --git a/client/ayon_core/tools/standalonepublish/widgets/widget_components.py b/client/ayon_core/tools/standalonepublish/widgets/widget_components.py index a86ac845f2..65488878f9 100644 --- a/client/ayon_core/tools/standalonepublish/widgets/widget_components.py +++ b/client/ayon_core/tools/standalonepublish/widgets/widget_components.py @@ -6,8 +6,8 @@ import string from qtpy import QtWidgets, QtCore -from openpype.pipeline import legacy_io -from openpype.lib import ( +from ayon_core.pipeline import legacy_io +from ayon_core.lib import ( execute, Logger, get_openpype_execute_args, diff --git a/client/ayon_core/tools/standalonepublish/widgets/widget_drop_frame.py b/client/ayon_core/tools/standalonepublish/widgets/widget_drop_frame.py index 306c43e85d..3fdd507da9 100644 --- a/client/ayon_core/tools/standalonepublish/widgets/widget_drop_frame.py +++ b/client/ayon_core/tools/standalonepublish/widgets/widget_drop_frame.py @@ -3,10 +3,10 @@ import re import json import clique import subprocess -import openpype.lib +import ayon_core.lib from qtpy import QtWidgets, QtCore -from openpype.lib import get_ffprobe_data +from ayon_core.lib import get_ffprobe_data from . import DropEmpty, ComponentsList, ComponentItem diff --git a/client/ayon_core/tools/standalonepublish/widgets/widget_family.py b/client/ayon_core/tools/standalonepublish/widgets/widget_family.py index 73dc2122db..13ef65ee28 100644 --- a/client/ayon_core/tools/standalonepublish/widgets/widget_family.py +++ b/client/ayon_core/tools/standalonepublish/widgets/widget_family.py @@ -2,16 +2,16 @@ import re from qtpy import QtWidgets, QtCore -from openpype.client import ( +from ayon_core.client import ( get_asset_by_name, get_subset_by_name, get_subsets, get_last_version_by_subset_id, ) -from openpype.settings import get_project_settings -from openpype.pipeline import LegacyCreator -from openpype.pipeline.version_start import get_versioning_start -from openpype.pipeline.create import ( +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import LegacyCreator +from ayon_core.pipeline.version_start import get_versioning_start +from ayon_core.pipeline.create import ( SUBSET_NAME_ALLOWED_SYMBOLS, TaskNotSetError, ) diff --git a/client/ayon_core/tools/stdout_broker/app.py b/client/ayon_core/tools/stdout_broker/app.py index f8dc2111aa..5f01b41fe5 100644 --- a/client/ayon_core/tools/stdout_broker/app.py +++ b/client/ayon_core/tools/stdout_broker/app.py @@ -6,7 +6,7 @@ import websocket import json from datetime import datetime -from openpype.lib import Logger +from ayon_core.lib import Logger from openpype_modules.webserver.host_console_listener import MsgAction log = Logger.get_logger(__name__) diff --git a/client/ayon_core/tools/stdout_broker/window.py b/client/ayon_core/tools/stdout_broker/window.py index 5825da73e2..0d5bac5732 100644 --- a/client/ayon_core/tools/stdout_broker/window.py +++ b/client/ayon_core/tools/stdout_broker/window.py @@ -3,7 +3,7 @@ import collections from qtpy import QtWidgets -from openpype import style +from ayon_core import style class ConsoleDialog(QtWidgets.QDialog): diff --git a/client/ayon_core/tools/subsetmanager/model.py b/client/ayon_core/tools/subsetmanager/model.py index 2df0cb7067..638d096918 100644 --- a/client/ayon_core/tools/subsetmanager/model.py +++ b/client/ayon_core/tools/subsetmanager/model.py @@ -2,7 +2,7 @@ import uuid from qtpy import QtCore, QtGui -from openpype.pipeline import registered_host +from ayon_core.pipeline import registered_host ITEM_ID_ROLE = QtCore.Qt.UserRole + 1 diff --git a/client/ayon_core/tools/subsetmanager/window.py b/client/ayon_core/tools/subsetmanager/window.py index 30de83c142..97dab1adb2 100644 --- a/client/ayon_core/tools/subsetmanager/window.py +++ b/client/ayon_core/tools/subsetmanager/window.py @@ -4,14 +4,14 @@ import sys from qtpy import QtWidgets, QtCore import qtawesome -from openpype import style -from openpype.pipeline import registered_host -from openpype.tools.utils import PlaceholderLineEdit -from openpype.tools.utils.lib import ( +from ayon_core import style +from ayon_core.pipeline import registered_host +from ayon_core.tools.utils import PlaceholderLineEdit +from ayon_core.tools.utils.lib import ( iter_model_rows, qt_app_context ) -from openpype.tools.utils.models import RecursiveSortFilterProxyModel +from ayon_core.tools.utils.models import RecursiveSortFilterProxyModel from .model import ( InstanceModel, ITEM_ID_ROLE diff --git a/client/ayon_core/tools/texture_copy/app.py b/client/ayon_core/tools/texture_copy/app.py index a5a9f7349a..064f4e5577 100644 --- a/client/ayon_core/tools/texture_copy/app.py +++ b/client/ayon_core/tools/texture_copy/app.py @@ -4,9 +4,9 @@ import click import speedcopy -from openpype.client import get_project, get_asset_by_name -from openpype.lib import Terminal -from openpype.pipeline import legacy_io, Anatomy +from ayon_core.client import get_project, get_asset_by_name +from ayon_core.lib import Terminal +from ayon_core.pipeline import legacy_io, Anatomy t = Terminal() diff --git a/client/ayon_core/tools/tray/pype_info_widget.py b/client/ayon_core/tools/tray/pype_info_widget.py index acd937e711..be6768c40c 100644 --- a/client/ayon_core/tools/tray/pype_info_widget.py +++ b/client/ayon_core/tools/tray/pype_info_widget.py @@ -5,13 +5,13 @@ import collections import ayon_api from qtpy import QtCore, QtGui, QtWidgets -from openpype import style -import openpype.version -from openpype import resources -from openpype import AYON_SERVER_ENABLED -from openpype.settings.lib import get_local_settings -from openpype.lib import get_openpype_execute_args -from openpype.lib.pype_info import ( +from ayon_core import style +import ayon_core.version +from ayon_core import resources +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.settings.lib import get_local_settings +from ayon_core.lib import get_openpype_execute_args +from ayon_core.lib.pype_info import ( get_all_current_info, get_openpype_info, get_workstation_info, diff --git a/client/ayon_core/tools/tray/pype_tray.py b/client/ayon_core/tools/tray/pype_tray.py index 769ed4272b..ff4d15c00f 100644 --- a/client/ayon_core/tools/tray/pype_tray.py +++ b/client/ayon_core/tools/tray/pype_tray.py @@ -7,15 +7,15 @@ import platform from qtpy import QtCore, QtGui, QtWidgets -import openpype.version -from openpype import AYON_SERVER_ENABLED -from openpype import resources, style -from openpype.lib import ( +import ayon_core.version +from ayon_core import AYON_SERVER_ENABLED +from ayon_core import resources, style +from ayon_core.lib import ( Logger, get_openpype_execute_args, run_detached_process, ) -from openpype.lib.openpype_version import ( +from ayon_core.lib.openpype_version import ( op_version_control_available, get_expected_version, get_installed_version, @@ -26,14 +26,14 @@ from openpype.lib.openpype_version import ( is_running_staging, is_staging_enabled, ) -from openpype.modules import TrayModulesManager -from openpype.settings import ( +from ayon_core.modules import TrayModulesManager +from ayon_core.settings import ( get_system_settings, SystemSettings, ProjectSettings, DefaultsNotDefined ) -from openpype.tools.utils import ( +from ayon_core.tools.utils import ( WrappedCallbackItem, paint_image_with_color, get_warning_pixmap, @@ -466,7 +466,7 @@ class TrayManager: def initialize_modules(self): """Add modules to tray.""" - from openpype.modules import ( + from ayon_core.modules import ( ITrayAction, ITrayService ) diff --git a/client/ayon_core/tools/traypublisher/window.py b/client/ayon_core/tools/traypublisher/window.py index a1ed38dcc0..305b5b28db 100644 --- a/client/ayon_core/tools/traypublisher/window.py +++ b/client/ayon_core/tools/traypublisher/window.py @@ -12,14 +12,14 @@ from qtpy import QtWidgets, QtCore import qtawesome import appdirs -from openpype.lib import JSONSettingRegistry -from openpype.pipeline import install_host -from openpype.hosts.traypublisher.api import TrayPublisherHost -from openpype.tools.publisher.control_qt import QtPublisherController -from openpype.tools.publisher.window import PublisherWindow -from openpype.tools.utils import PlaceholderLineEdit, get_openpype_qt_app -from openpype.tools.utils.constants import PROJECT_NAME_ROLE -from openpype.tools.utils.models import ( +from ayon_core.lib import JSONSettingRegistry +from ayon_core.pipeline import install_host +from ayon_core.hosts.traypublisher.api import TrayPublisherHost +from ayon_core.tools.publisher.control_qt import QtPublisherController +from ayon_core.tools.publisher.window import PublisherWindow +from ayon_core.tools.utils import PlaceholderLineEdit, get_openpype_qt_app +from ayon_core.tools.utils.constants import PROJECT_NAME_ROLE +from ayon_core.tools.utils.models import ( ProjectModel, ProjectSortFilterProxy ) diff --git a/client/ayon_core/tools/utils/assets_widget.py b/client/ayon_core/tools/utils/assets_widget.py index b83f4dfcaf..1296f29a09 100644 --- a/client/ayon_core/tools/utils/assets_widget.py +++ b/client/ayon_core/tools/utils/assets_widget.py @@ -5,16 +5,16 @@ import qtpy from qtpy import QtWidgets, QtCore, QtGui import qtawesome -from openpype import AYON_SERVER_ENABLED -from openpype.client import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.client import ( get_project, get_assets, ) -from openpype.style import ( +from ayon_core.style import ( get_objected_colors, get_default_tools_icon_color, ) -from openpype.tools.flickcharm import FlickCharm +from ayon_core.tools.flickcharm import FlickCharm from .views import ( TreeViewSpinner, diff --git a/client/ayon_core/tools/utils/delegates.py b/client/ayon_core/tools/utils/delegates.py index c51323e556..b4a687c339 100644 --- a/client/ayon_core/tools/utils/delegates.py +++ b/client/ayon_core/tools/utils/delegates.py @@ -5,11 +5,11 @@ import numbers from qtpy import QtWidgets, QtGui, QtCore -from openpype.client import ( +from ayon_core.client import ( get_versions, get_hero_versions, ) -from openpype.pipeline import HeroVersionType +from ayon_core.pipeline import HeroVersionType from .models import TreeModel from . import lib diff --git a/client/ayon_core/tools/utils/host_tools.py b/client/ayon_core/tools/utils/host_tools.py index cc20774349..c57a39ae70 100644 --- a/client/ayon_core/tools/utils/host_tools.py +++ b/client/ayon_core/tools/utils/host_tools.py @@ -7,10 +7,10 @@ import os import pyblish.api -from openpype import AYON_SERVER_ENABLED -from openpype.host import IWorkfileHost, ILoadHost -from openpype.lib import Logger -from openpype.pipeline import ( +from ayon_core import AYON_SERVER_ENABLED +from ayon_core.host import IWorkfileHost, ILoadHost +from ayon_core.lib import Logger +from ayon_core.pipeline import ( registered_host, get_current_asset_name, ) @@ -49,13 +49,13 @@ class HostToolsHelper: return self._log def _init_ayon_workfiles_tool(self, parent): - from openpype.tools.ayon_workfiles.widgets import WorkfilesToolWindow + from ayon_core.tools.ayon_workfiles.widgets import WorkfilesToolWindow workfiles_window = WorkfilesToolWindow(parent=parent) self._workfiles_tool = workfiles_window def _init_openpype_workfiles_tool(self, parent): - from openpype.tools.workfiles.app import Window + from ayon_core.tools.workfiles.app import Window # Host validation host = registered_host() @@ -89,8 +89,8 @@ class HostToolsHelper: host = registered_host() ILoadHost.validate_load_methods(host) if AYON_SERVER_ENABLED: - from openpype.tools.ayon_loader.ui import LoaderWindow - from openpype.tools.ayon_loader import LoaderController + from ayon_core.tools.ayon_loader.ui import LoaderWindow + from ayon_core.tools.ayon_loader import LoaderController controller = LoaderController(host=host) loader_window = LoaderWindow( @@ -99,7 +99,7 @@ class HostToolsHelper: ) else: - from openpype.tools.loader import LoaderWindow + from ayon_core.tools.loader import LoaderWindow loader_window = LoaderWindow(parent=parent or self._parent) self._loader_tool = loader_window @@ -128,7 +128,7 @@ class HostToolsHelper: def get_creator_tool(self, parent): """Create, cache and return creator tool window.""" if self._creator_tool is None: - from openpype.tools.creator import CreatorWindow + from ayon_core.tools.creator import CreatorWindow creator_window = CreatorWindow(parent=parent or self._parent) self._creator_tool = creator_window @@ -149,7 +149,7 @@ class HostToolsHelper: def get_subset_manager_tool(self, parent): """Create, cache and return subset manager tool window.""" if self._subset_manager_tool is None: - from openpype.tools.subsetmanager import SubsetManagerWindow + from ayon_core.tools.subsetmanager import SubsetManagerWindow subset_manager_window = SubsetManagerWindow( parent=parent or self._parent @@ -175,7 +175,7 @@ class HostToolsHelper: ILoadHost.validate_load_methods(host) if AYON_SERVER_ENABLED: - from openpype.tools.ayon_sceneinventory.window import ( + from ayon_core.tools.ayon_sceneinventory.window import ( SceneInventoryWindow) scene_inventory_window = SceneInventoryWindow( @@ -183,7 +183,7 @@ class HostToolsHelper: ) else: - from openpype.tools.sceneinventory import SceneInventoryWindow + from ayon_core.tools.sceneinventory import SceneInventoryWindow scene_inventory_window = SceneInventoryWindow( parent=parent or self._parent @@ -210,7 +210,7 @@ class HostToolsHelper: return self.get_loader_tool(parent) if self._library_loader_tool is None: - from openpype.tools.libraryloader import LibraryLoaderWindow + from ayon_core.tools.libraryloader import LibraryLoaderWindow library_window = LibraryLoaderWindow( parent=parent or self._parent @@ -269,7 +269,7 @@ class HostToolsHelper: experimental tools. """ if self._experimental_tools_dialog is None: - from openpype.tools.experimental_tools import ( + from ayon_core.tools.experimental_tools import ( ExperimentalToolsDialog ) @@ -290,7 +290,7 @@ class HostToolsHelper: """Create, cache and return publisher window.""" if self._publisher_tool is None: - from openpype.tools.publisher.window import PublisherWindow + from ayon_core.tools.publisher.window import PublisherWindow host = registered_host() ILoadHost.validate_load_methods(host) diff --git a/client/ayon_core/tools/utils/lib.py b/client/ayon_core/tools/utils/lib.py index 365caaafd9..1d816fa85c 100644 --- a/client/ayon_core/tools/utils/lib.py +++ b/client/ayon_core/tools/utils/lib.py @@ -7,19 +7,19 @@ import traceback from qtpy import QtWidgets, QtCore, QtGui import qtawesome -from openpype.client import ( +from ayon_core.client import ( get_project, get_asset_by_name, ) -from openpype.style import ( +from ayon_core.style import ( get_default_entity_icon_color, get_objected_colors, get_app_icon_path, ) -from openpype.resources import get_image_path -from openpype.lib import filter_profiles, Logger -from openpype.settings import get_project_settings -from openpype.pipeline import ( +from ayon_core.resources import get_image_path +from ayon_core.lib import filter_profiles, Logger +from ayon_core.settings import get_project_settings +from ayon_core.pipeline import ( registered_host, get_current_context, get_current_host_name, @@ -771,7 +771,7 @@ def get_repre_icons(): except Exception: # Backwards compatibility try: - from openpype.modules import sync_server + from ayon_core.modules import sync_server except Exception: return icons diff --git a/client/ayon_core/tools/utils/models.py b/client/ayon_core/tools/utils/models.py index 94645af110..f09abb9995 100644 --- a/client/ayon_core/tools/utils/models.py +++ b/client/ayon_core/tools/utils/models.py @@ -3,7 +3,7 @@ import logging import qtpy from qtpy import QtCore, QtGui -from openpype.client import get_projects +from ayon_core.client import get_projects from .constants import ( PROJECT_IS_ACTIVE_ROLE, PROJECT_NAME_ROLE, diff --git a/client/ayon_core/tools/utils/overlay_messages.py b/client/ayon_core/tools/utils/overlay_messages.py index 4da266bcf7..ef4ac4cf11 100644 --- a/client/ayon_core/tools/utils/overlay_messages.py +++ b/client/ayon_core/tools/utils/overlay_messages.py @@ -2,7 +2,7 @@ import uuid from qtpy import QtWidgets, QtCore, QtGui -from openpype.style import get_objected_colors +from ayon_core.style import get_objected_colors from .lib import set_style_property diff --git a/client/ayon_core/tools/utils/tasks_widget.py b/client/ayon_core/tools/utils/tasks_widget.py index b554ed50d3..7ee70733b2 100644 --- a/client/ayon_core/tools/utils/tasks_widget.py +++ b/client/ayon_core/tools/utils/tasks_widget.py @@ -1,12 +1,12 @@ from qtpy import QtWidgets, QtCore, QtGui import qtawesome -from openpype.client import ( +from ayon_core.client import ( get_project, get_asset_by_id, ) -from openpype.style import get_disabled_entity_icon_color -from openpype.tools.utils.lib import get_task_icon +from ayon_core.style import get_disabled_entity_icon_color +from ayon_core.tools.utils.lib import get_task_icon from .views import DeselectableTreeView diff --git a/client/ayon_core/tools/utils/thumbnail_paint_widget.py b/client/ayon_core/tools/utils/thumbnail_paint_widget.py index 130942aaf0..9dbc2bcdd0 100644 --- a/client/ayon_core/tools/utils/thumbnail_paint_widget.py +++ b/client/ayon_core/tools/utils/thumbnail_paint_widget.py @@ -1,6 +1,6 @@ from qtpy import QtWidgets, QtCore, QtGui -from openpype.style import get_objected_colors +from ayon_core.style import get_objected_colors from .lib import paint_image_with_color from .images import get_image diff --git a/client/ayon_core/tools/utils/views.py b/client/ayon_core/tools/utils/views.py index 596a47ede9..b501f1ff11 100644 --- a/client/ayon_core/tools/utils/views.py +++ b/client/ayon_core/tools/utils/views.py @@ -1,5 +1,5 @@ -from openpype.resources import get_image_path -from openpype.tools.flickcharm import FlickCharm +from ayon_core.resources import get_image_path +from ayon_core.tools.flickcharm import FlickCharm from qtpy import QtWidgets, QtCore, QtGui, QtSvg diff --git a/client/ayon_core/tools/utils/widgets.py b/client/ayon_core/tools/utils/widgets.py index 9223afecaa..29bafb3a6b 100644 --- a/client/ayon_core/tools/utils/widgets.py +++ b/client/ayon_core/tools/utils/widgets.py @@ -4,12 +4,12 @@ from qtpy import QtWidgets, QtCore, QtGui import qargparse import qtawesome -from openpype.style import ( +from ayon_core.style import ( get_objected_colors, get_style_image_path, get_default_tools_icon_color, ) -from openpype.lib.attribute_definitions import AbstractAttrDef +from ayon_core.lib.attribute_definitions import AbstractAttrDef from .lib import get_qta_icon_by_name_and_color diff --git a/client/ayon_core/tools/workfile_template_build/window.py b/client/ayon_core/tools/workfile_template_build/window.py index df7aedf566..7f95bac60a 100644 --- a/client/ayon_core/tools/workfile_template_build/window.py +++ b/client/ayon_core/tools/workfile_template_build/window.py @@ -1,9 +1,9 @@ from qtpy import QtWidgets -from openpype import style -from openpype.lib import Logger -from openpype.pipeline import legacy_io -from openpype.tools.attribute_defs import AttributeDefinitionsWidget +from ayon_core import style +from ayon_core.lib import Logger +from ayon_core.pipeline import legacy_io +from ayon_core.tools.attribute_defs import AttributeDefinitionsWidget class WorkfileBuildPlaceholderDialog(QtWidgets.QDialog): diff --git a/client/ayon_core/tools/workfiles/app.py b/client/ayon_core/tools/workfiles/app.py index 2d0d551faf..9943b4be0c 100644 --- a/client/ayon_core/tools/workfiles/app.py +++ b/client/ayon_core/tools/workfiles/app.py @@ -1,12 +1,12 @@ import sys import logging -from openpype.host import IWorkfileHost -from openpype.pipeline import ( +from ayon_core.host import IWorkfileHost +from ayon_core.pipeline import ( registered_host, legacy_io, ) -from openpype.tools.utils import qt_app_context +from ayon_core.tools.utils import qt_app_context from .window import Window log = logging.getLogger(__name__) diff --git a/client/ayon_core/tools/workfiles/files_widget.py b/client/ayon_core/tools/workfiles/files_widget.py index e4715a0340..432eab089e 100644 --- a/client/ayon_core/tools/workfiles/files_widget.py +++ b/client/ayon_core/tools/workfiles/files_widget.py @@ -6,28 +6,28 @@ import copy import qtpy from qtpy import QtWidgets, QtCore -from openpype.host import IWorkfileHost -from openpype.client import get_asset_by_id -from openpype.pipeline.workfile.lock_workfile import ( +from ayon_core.host import IWorkfileHost +from ayon_core.client import get_asset_by_id +from ayon_core.pipeline.workfile.lock_workfile import ( is_workfile_locked, is_workfile_lock_enabled, is_workfile_locked_for_current_process ) -from openpype.tools.utils import PlaceholderLineEdit -from openpype.tools.utils.delegates import PrettyTimeDelegate -from openpype.lib import emit_event -from openpype.tools.workfiles.lock_dialog import WorkfileLockDialog -from openpype.pipeline import ( +from ayon_core.tools.utils import PlaceholderLineEdit +from ayon_core.tools.utils.delegates import PrettyTimeDelegate +from ayon_core.lib import emit_event +from ayon_core.tools.workfiles.lock_dialog import WorkfileLockDialog +from ayon_core.pipeline import ( registered_host, legacy_io, Anatomy, get_current_project_name, ) -from openpype.pipeline.context_tools import ( +from ayon_core.pipeline.context_tools import ( compute_session_changes, change_current_context ) -from openpype.pipeline.workfile import ( +from ayon_core.pipeline.workfile import ( get_workfile_template_key, create_workdir_extra_folders, ) diff --git a/client/ayon_core/tools/workfiles/lock_dialog.py b/client/ayon_core/tools/workfiles/lock_dialog.py index 29e0d3bd9b..45144b7d2a 100644 --- a/client/ayon_core/tools/workfiles/lock_dialog.py +++ b/client/ayon_core/tools/workfiles/lock_dialog.py @@ -1,7 +1,7 @@ from qtpy import QtWidgets, QtCore, QtGui -from openpype.style import load_stylesheet, get_app_icon_path +from ayon_core.style import load_stylesheet, get_app_icon_path -from openpype.pipeline.workfile.lock_workfile import get_workfile_lock_data +from ayon_core.pipeline.workfile.lock_workfile import get_workfile_lock_data class WorkfileLockDialog(QtWidgets.QDialog): diff --git a/client/ayon_core/tools/workfiles/model.py b/client/ayon_core/tools/workfiles/model.py index bbd67c9b98..e2e720904a 100644 --- a/client/ayon_core/tools/workfiles/model.py +++ b/client/ayon_core/tools/workfiles/model.py @@ -4,16 +4,16 @@ import logging from qtpy import QtCore, QtGui import qtawesome -from openpype.client import ( +from ayon_core.client import ( get_subsets, get_versions, get_representations, ) -from openpype.style import ( +from ayon_core.style import ( get_default_entity_icon_color, get_disabled_entity_icon_color, ) -from openpype.pipeline import get_representation_path +from ayon_core.pipeline import get_representation_path log = logging.getLogger(__name__) diff --git a/client/ayon_core/tools/workfiles/save_as_dialog.py b/client/ayon_core/tools/workfiles/save_as_dialog.py index 7052eaed06..d63bc9cb80 100644 --- a/client/ayon_core/tools/workfiles/save_as_dialog.py +++ b/client/ayon_core/tools/workfiles/save_as_dialog.py @@ -5,14 +5,14 @@ import logging from qtpy import QtWidgets, QtCore -from openpype.pipeline import ( +from ayon_core.pipeline import ( registered_host, legacy_io, ) -from openpype.pipeline.workfile import get_last_workfile_with_version -from openpype.pipeline.template_data import get_template_data_with_names -from openpype.tools.utils import PlaceholderLineEdit -from openpype.pipeline import version_start, get_current_host_name +from ayon_core.pipeline.workfile import get_last_workfile_with_version +from ayon_core.pipeline.template_data import get_template_data_with_names +from ayon_core.tools.utils import PlaceholderLineEdit +from ayon_core.pipeline import version_start, get_current_host_name log = logging.getLogger(__name__) diff --git a/client/ayon_core/tools/workfiles/window.py b/client/ayon_core/tools/workfiles/window.py index 50c39d4a40..7ce35bbf43 100644 --- a/client/ayon_core/tools/workfiles/window.py +++ b/client/ayon_core/tools/workfiles/window.py @@ -4,26 +4,26 @@ import copy import platform from qtpy import QtCore, QtWidgets, QtGui -from openpype.client import ( +from ayon_core.client import ( get_asset_by_name, get_workfile_info, ) -from openpype.client.operations import ( +from ayon_core.client.operations import ( OperationsSession, new_workfile_info_doc, prepare_workfile_info_update_data, ) -from openpype import style -from openpype import resources -from openpype.pipeline import ( +from ayon_core import style +from ayon_core import resources +from ayon_core.pipeline import ( Anatomy, get_current_project_name, get_current_asset_name, get_current_task_name, ) -from openpype.pipeline import legacy_io -from openpype.tools.utils.assets_widget import SingleSelectAssetsWidget -from openpype.tools.utils.tasks_widget import TasksWidget +from ayon_core.pipeline import legacy_io +from ayon_core.tools.utils.assets_widget import SingleSelectAssetsWidget +from ayon_core.tools.utils.tasks_widget import TasksWidget from .files_widget import FilesWidget diff --git a/client/ayon_core/widgets/README.md b/client/ayon_core/widgets/README.md index cda83a95d3..d9c8db98e7 100644 --- a/client/ayon_core/widgets/README.md +++ b/client/ayon_core/widgets/README.md @@ -49,8 +49,8 @@ class ExampleWorker(QtCore.QObject): import os from qtpy import QtCore from pathlib import Path -from openpype.widgets.splash_screen import SplashScreen -from openpype import resources +from ayon_core.widgets.splash_screen import SplashScreen +from ayon_core import resources def exec_plugin_install( engine_path: Path, env: dict = None): diff --git a/client/ayon_core/widgets/nice_checkbox.py b/client/ayon_core/widgets/nice_checkbox.py index 651187a8ab..06845c397a 100644 --- a/client/ayon_core/widgets/nice_checkbox.py +++ b/client/ayon_core/widgets/nice_checkbox.py @@ -1,7 +1,7 @@ from math import floor, sqrt, ceil from qtpy import QtWidgets, QtCore, QtGui -from openpype.style import get_objected_colors +from ayon_core.style import get_objected_colors class NiceCheckbox(QtWidgets.QFrame): diff --git a/client/ayon_core/widgets/password_dialog.py b/client/ayon_core/widgets/password_dialog.py index 4132961716..4f8bdedee3 100644 --- a/client/ayon_core/widgets/password_dialog.py +++ b/client/ayon_core/widgets/password_dialog.py @@ -1,10 +1,10 @@ from qtpy import QtWidgets, QtCore, QtGui -from openpype import style -from openpype.resources import get_resource +from ayon_core import style +from ayon_core.resources import get_resource -from openpype.settings import get_system_settings -from openpype.settings.lib import ( +from ayon_core.settings import get_system_settings +from ayon_core.settings.lib import ( get_local_settings, save_local_settings )