Merge pull request #8 from ynput/enhancement/remove-legacy-io

Don't use legacy io

client/ayon_core/host/host.py

@@ -49,7 +49,6 @@ class HostBase(object):
  Todo:
  - move content of 'install_host' as method of this class
  - register host object
- - install legacy_io
  - install global plugin paths
  - store registered plugin paths to this object
  - handle current context (project, asset, task)
@@ -133,8 +132,6 @@ def get_current_context(self):
  can be opened multiple workfiles at one moment and change of context
  can't be caught properly.
 
- Default implementation returns values from 'legacy_io.Session'.
-
  Returns:
  Dict[str, Union[str, None]]: Context with 3 keys 'project_name',
  'asset_name' and 'task_name'. All of them can be 'None'.

client/ayon_core/hosts/aftereffects/api/launch_logic.py

@@ -17,7 +17,7 @@
 
 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.pipeline import install_host
 from ayon_core.addon import AddonsManager
 from ayon_core.tools.utils import host_tools, get_ayon_qt_app
 from ayon_core.tools.adobe_webserver.app import WebServerTool
@@ -298,13 +298,10 @@ async def set_context(self, project, asset, task):
  log.info("Setting context change")
  log.info("project {} asset {} ".format(project, asset))
  if project:
- legacy_io.Session["AVALON_PROJECT"] = project
  os.environ["AVALON_PROJECT"] = project
  if asset:
- legacy_io.Session["AVALON_ASSET"] = asset
  os.environ["AVALON_ASSET"] = asset
  if task:
- legacy_io.Session["AVALON_TASK"] = task
  os.environ["AVALON_TASK"] = task
 
  async def read(self):

client/ayon_core/hosts/blender/api/pipeline.py

@@ -19,7 +19,6 @@
 from ayon_core.client import get_asset_by_name
 from ayon_core.pipeline import (
  schema,
- legacy_io,
  get_current_project_name,
  get_current_asset_name,
  register_loader_plugin_path,
@@ -380,7 +379,7 @@ def _on_task_changed():
  # `directory` attribute, so it opens in that directory (does it?).
  # https://docs.blender.org/api/blender2.8/bpy.types.Operator.html#calling-a-file-selector
  # https://docs.blender.org/api/blender2.8/bpy.types.WindowManager.html#bpy.types.WindowManager.fileselect_add
- workdir = legacy_io.Session["AVALON_WORKDIR"]
+ workdir = os.getenv("AVALON_WORKDIR")
  log.debug("New working directory: %s", workdir)
 
 

client/ayon_core/hosts/fusion/api/plugin.py

@@ -11,7 +11,6 @@
  EnumDef,
 )
 from ayon_core.pipeline import (
- legacy_io,
  Creator,
  CreatedInstance
 )
@@ -136,7 +135,7 @@ def _configure_saver_tool(self, data, tool, subset):
  ext = data["creator_attributes"]["image_format"]
 
  # Subset change detected
- workdir = os.path.normpath(legacy_io.Session["AVALON_WORKDIR"])
+ workdir = os.path.normpath(os.getenv("AVALON_WORKDIR"))
  formatting_data.update({
  "workdir": workdir,
  "frame": "0" * frame_padding,

client/ayon_core/hosts/houdini/api/usd.py

@@ -7,7 +7,7 @@
 
 from ayon_core import style
 from ayon_core.client import get_asset_by_name
-from ayon_core.pipeline import legacy_io, get_current_project_name
+from ayon_core.pipeline import get_current_project_name
 from ayon_core.tools.utils.assets_widget import SingleSelectAssetsWidget
 
 from pxr import Sdf
@@ -27,7 +27,8 @@ def __init__(self, parm):
  self.setWindowTitle("Pick Asset")
  self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Popup)
 
- assets_widget = SingleSelectAssetsWidget(legacy_io, parent=self)
+ assets_widget = SingleSelectAssetsWidget(self)
+ assets_widget.set_project_name(get_current_project_name(), False)
 
  layout = QtWidgets.QHBoxLayout(self)
  layout.addWidget(assets_widget)

client/ayon_core/hosts/maya/api/pipeline.py

@@ -26,7 +26,6 @@
  emit_event
 )
 from ayon_core.pipeline import (
- legacy_io,
  get_current_project_name,
  register_loader_plugin_path,
  register_inventory_action_path,
@@ -247,7 +246,7 @@ def _set_project():
  None
 
  """
- workdir = legacy_io.Session["AVALON_WORKDIR"]
+ workdir = os.getenv("AVALON_WORKDIR")
 
  try:
  os.makedirs(workdir)
@@ -629,7 +628,7 @@ def on_task_changed():
  # Run
  menu.update_menu_task_label()
 
- workdir = legacy_io.Session["AVALON_WORKDIR"]
+ workdir = os.getenv("AVALON_WORKDIR")
  if os.path.exists(workdir):
  log.info("Updating Maya workspace for task change to %s", workdir)
  _set_project()
@@ -678,7 +677,7 @@ def workfile_save_before_xgen(event):
 
  import xgenm
 
- current_work_dir = legacy_io.Session["AVALON_WORKDIR"].replace("\\", "/")
+ current_work_dir = os.getenv("AVALON_WORKDIR").replace("\\", "/")
  expected_work_dir = event.data["workdir_path"].replace("\\", "/")
  if current_work_dir == expected_work_dir:
  return

client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py

@@ -6,7 +6,6 @@
 from ayon_core.settings import get_project_settings
 from ayon_core.pipeline import (
  load,
- legacy_io,
  get_representation_path
 )
 from ayon_core.hosts.maya.api.lib import (
@@ -26,11 +25,6 @@ def is_sequence(files):
  return sequence
 
 
-def get_current_session_fps():
- session_fps = float(legacy_io.Session.get('AVALON_FPS', 25))
- return convert_to_maya_fps(session_fps)
-
-
 class ArnoldStandinLoader(load.LoaderPlugin):
  """Load as Arnold standin"""
 
@@ -99,7 +93,7 @@ def load(self, context, name, namespace, options):
  sequence = is_sequence(os.listdir(os.path.dirname(repre_path)))
  cmds.setAttr(standin_shape + ".useFrameExtension", sequence)
 
- fps = float(version["data"].get("fps"))or get_current_session_fps()
+ fps = float(version["data"].get("fps")) or 25
  cmds.setAttr(standin_shape + ".abcFPS", fps)
 
  nodes = [root, standin, standin_shape]

client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py

@@ -1,13 +1,8 @@
 # -*- coding: utf-8 -*-
 """Collect Vray Scene and prepare it for extraction and publishing."""
-import re
-
-import maya.app.renderSetup.model.renderSetup as renderSetup
-from maya import cmds
 
 import pyblish.api
 
-from ayon_core.pipeline import legacy_io
 from ayon_core.lib import get_formatted_current_time
 from ayon_core.hosts.maya.api import lib
 

client/ayon_core/hosts/maya/plugins/publish/validate_model_name.py

@@ -12,7 +12,6 @@
 from ayon_core.client.mongo import OpenPypeMongoConnection
 from ayon_core.hosts.maya.api.shader_definition_editor import (
  DEFINITION_FILENAME)
-from ayon_core.pipeline import legacy_io
 from ayon_core.pipeline.publish import (
  OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder)
 

client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_in_database.py

@@ -3,7 +3,6 @@
 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)
 

client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py

@@ -2,7 +2,6 @@
 
 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
 
 

client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py

@@ -5,8 +5,6 @@
 import pyblish.api
 
 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,

client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py

@@ -17,7 +17,6 @@
 
 import pyblish.api
 
-from ayon_core.pipeline import legacy_io
 from openpype_modules.webpublisher.lib import (
  get_batch_asset_task_info,
  parse_json
@@ -71,8 +70,6 @@ def process(self, context):
 
  os.environ["AVALON_ASSET"] = asset_name
  os.environ["AVALON_TASK"] = task_name
- legacy_io.Session["AVALON_ASSET"] = asset_name
- legacy_io.Session["AVALON_TASK"] = task_name
 
  context.data["asset"] = asset_name
  context.data["task"] = task_name

client/ayon_core/hosts/traypublisher/api/pipeline.py

@@ -7,7 +7,6 @@
 
 from ayon_core.pipeline import (
  register_creator_plugin_path,
- legacy_io,
 )
 from ayon_core.host import HostBase, IPublishHost
 
@@ -24,7 +23,6 @@ class TrayPublisherHost(HostBase, IPublishHost):
 
  def install(self):
  os.environ["AVALON_APP"] = self.name
- legacy_io.Session["AVALON_APP"] = self.name
 
  pyblish.api.register_host("traypublisher")
  pyblish.api.register_plugin_path(PUBLISH_PATH)
@@ -43,8 +41,6 @@ def set_project_name(self, project_name):
  # TODO Deregister project specific plugins and register new project
  # plugins
  os.environ["AVALON_PROJECT"] = project_name
- legacy_io.Session["AVALON_PROJECT"] = project_name
- legacy_io.install()
  HostContext.set_project_name(project_name)
 
 

client/ayon_core/hosts/tvpaint/api/pipeline.py

@@ -13,7 +13,6 @@
 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,
@@ -66,11 +65,10 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
  def install(self):
  """Install TVPaint-specific functionality."""
 
- log.info("OpenPype - Installing TVPaint integration")
- legacy_io.install()
+ log.info("AYON - Installing TVPaint integration")
 
  # Create workdir folder if does not exist yet
- workdir = legacy_io.Session["AVALON_WORKDIR"]
+ workdir = os.getenv("AVALON_WORKDIR")
  if not os.path.exists(workdir):
  os.makedirs(workdir)
 

client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py

@@ -4,7 +4,6 @@
 
 import pyblish.api
 
-from ayon_core.pipeline import legacy_io
 from ayon_core.hosts.tvpaint.api.lib import (
  execute_george,
  execute_george_through_file,
@@ -90,7 +89,6 @@ def process(self, context):
  ("AVALON_TASK", "task_name")
  )
  for env_key, key in key_map:
- legacy_io.Session[env_key] = workfile_context[key]
  os.environ[env_key] = workfile_context[key]
  self.log.info("Context changed to: {}".format(workfile_context))
 

client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py

@@ -8,7 +8,6 @@
  env_value_to_bool,
  collect_frames,
 )
-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 ayon_core.tests.lib import is_in_tests
@@ -84,13 +83,17 @@ def get_job_info(self):
  "AVALON_PROJECT",
  "AVALON_ASSET",
  "AVALON_TASK",
+ "AVALON_WORKDIR",
  "AVALON_APP_NAME",
  "AYON_LOG_NO_COLORS",
  "IS_TEST"
  ]
 
- environment = dict({key: os.environ[key] for key in keys
- if key in os.environ}, **legacy_io.Session)
+ environment = {
+ key: os.environ[key]
+ for key in keys
+ if key in os.environ
+ }
  for key in keys:
  value = environment.get(key)
  if value:

client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py

@@ -11,7 +11,6 @@
  NumberDef,
  TextDef,
 )
-from ayon_core.pipeline import legacy_io
 from ayon_core.pipeline.publish import AYONPyblishPluginMixin
 from ayon_core.pipeline.farm.tools import iter_expected_files
 from ayon_core.tests.lib import is_in_tests
@@ -106,12 +105,16 @@ def get_job_info(self):
  "AVALON_PROJECT",
  "AVALON_ASSET",
  "AVALON_TASK",
+ "AVALON_WORKDIR",
  "AVALON_APP_NAME",
  "IS_TEST"
  ]
 
- environment = dict({key: os.environ[key] for key in keys
- if key in os.environ}, **legacy_io.Session)
+ environment = {
+ key: os.environ[key]
+ for key in keys
+ if key in os.environ
+ }
 
  for key in keys:
  value = environment.get(key)

client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py

@@ -6,7 +6,6 @@
 
 import pyblish.api
 
-from ayon_core.pipeline import legacy_io
 from ayon_core.pipeline.publish import (
  AYONPyblishPluginMixin
 )
@@ -224,14 +223,18 @@ def process(self, instance):
  "AVALON_PROJECT",
  "AVALON_ASSET",
  "AVALON_TASK",
+ "AVALON_WORKDIR",
  "AVALON_APP_NAME",
  "AYON_LOG_NO_COLORS",
  "IS_TEST",
  "AYON_BUNDLE_NAME",
  ]
 
- environment = dict({key: os.environ[key] for key in keys
- if key in os.environ}, **legacy_io.Session)
+ environment = {
+ key: os.environ[key]
+ for key in keys
+ if key in os.environ
+ }
 
  # to recognize render jobs
  environment["AYON_RENDER_JOB"] = "1"

client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py

@@ -10,7 +10,6 @@
 import attr
 import pyblish.api
 
-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 ayon_core.tests.lib import is_in_tests
@@ -277,13 +276,17 @@ def get_job_info(self):
  "AVALON_PROJECT",
  "AVALON_ASSET",
  "AVALON_TASK",
+ "AVALON_WORKDIR",
  "AVALON_APP_NAME",
  "AYON_LOG_NO_COLORS"
  "IS_TEST"
  ]
 
- environment = dict({key: os.environ[key] for key in keys
- if key in os.environ}, **legacy_io.Session)
+ environment = {
+ key: os.environ[key]
+ for key in keys
+ if key in os.environ
+ }
  for key in keys:
  value = environment.get(key)
  if value: