replaced avalon imports in blender

openpype/hosts/blender/api/ops.py

@@ -15,9 +15,9 @@ from Qt import QtWidgets, QtCore
 import bpy
 import bpy.utils.previews
 
-import avalon.api
-from openpype.tools.utils import host_tools
 from openpype import style
+from openpype.pipeline import legacy_io
+from openpype.tools.utils import host_tools
 
 from .workio import OpenFileCacher
 
@@ -279,7 +279,7 @@ class LaunchLoader(LaunchQtApp):
 
     def before_window_show(self):
         self._window.set_context(
-            {"asset": avalon.api.Session["AVALON_ASSET"]},
+            {"asset": legacy_io.Session["AVALON_ASSET"]},
             refresh=True
         )
 
@@ -327,8 +327,8 @@ class LaunchWorkFiles(LaunchQtApp):
     def execute(self, context):
         result = super().execute(context)
         self._window.set_context({
-            "asset": avalon.api.Session["AVALON_ASSET"],
-            "task": avalon.api.Session["AVALON_TASK"]
+            "asset": legacy_io.Session["AVALON_ASSET"],
+            "task": legacy_io.Session["AVALON_TASK"]
         })
         return result
 
@@ -358,8 +358,8 @@ class TOPBAR_MT_avalon(bpy.types.Menu):
         else:
             pyblish_menu_icon_id = 0
 
-        asset = avalon.api.Session['AVALON_ASSET']
-        task = avalon.api.Session['AVALON_TASK']
+        asset = legacy_io.Session['AVALON_ASSET']
+        task = legacy_io.Session['AVALON_TASK']
         context_label = f"{asset}, {task}"
         context_label_item = layout.row()
         context_label_item.operator(

openpype/hosts/blender/api/pipeline.py

@@ -1,6 +1,5 @@
 import os
 import sys
-import importlib
 import traceback
 from typing import Callable, Dict, Iterator, List, Optional
 
@@ -10,17 +9,15 @@ from . import lib
 from . import ops
 
 import pyblish.api
-import avalon.api
-from avalon import io
 
 from openpype.pipeline import (
     schema,
+    legacy_io,
     register_loader_plugin_path,
     register_creator_plugin_path,
     deregister_loader_plugin_path,
     deregister_creator_plugin_path,
     AVALON_CONTAINER_ID,
-    uninstall_host,
 )
 from openpype.api import Logger
 from openpype.lib import (
@@ -86,8 +83,8 @@ def uninstall():
 
 
 def set_start_end_frames():
-    asset_name = io.Session["AVALON_ASSET"]
-    asset_doc = io.find_one({
+    asset_name = legacy_io.Session["AVALON_ASSET"]
+    asset_doc = legacy_io.find_one({
         "type": "asset",
         "name": asset_name
     })
@@ -191,7 +188,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 = avalon.api.Session["AVALON_WORKDIR"]
+    workdir = legacy_io.Session["AVALON_WORKDIR"]
     log.debug("New working directory: %s", workdir)
 
 
@@ -202,26 +199,6 @@ def _register_events():
     log.info("Installed event callback for 'taskChanged'...")
 
 
-def reload_pipeline(*args):
-    """Attempt to reload pipeline at run-time.
-
-    Warning:
-        This is primarily for development and debugging purposes and not well
-        tested.
-
-    """
-
-    uninstall_host()
-
-    for module in (
-        "avalon.io",
-        "avalon.pipeline",
-        "avalon.api",
-    ):
-        module = importlib.import_module(module)
-        importlib.reload(module)
-
-
 def _discover_gui() -> Optional[Callable]:
     """Return the most desirable of the currently registered GUIs"""
 

openpype/hosts/blender/plugins/create/create_action.py

@@ -2,7 +2,7 @@
 
 import bpy
 
-from avalon import api
+from openpype.pipeline import legacy_io
 import openpype.hosts.blender.api.plugin
 from openpype.hosts.blender.api import lib
 
@@ -22,7 +22,7 @@ class CreateAction(openpype.hosts.blender.api.plugin.Creator):
         name = openpype.hosts.blender.api.plugin.asset_name(asset, subset)
         collection = bpy.data.collections.new(name=name)
         bpy.context.scene.collection.children.link(collection)
-        self.data['task'] = api.Session.get('AVALON_TASK')
+        self.data['task'] = legacy_io.Session.get('AVALON_TASK')
         lib.imprint(collection, self.data)
 
         if (self.options or {}).get("useSelection"):

openpype/hosts/blender/plugins/create/create_animation.py

@@ -2,7 +2,7 @@
 
 import bpy
 
-from avalon import api
+from openpype.pipeline import legacy_io
 from openpype.hosts.blender.api import plugin, lib, ops
 from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES
 
@@ -37,7 +37,7 @@ class CreateAnimation(plugin.Creator):
         # asset_group.empty_display_type = 'SINGLE_ARROW'
         asset_group = bpy.data.collections.new(name=name)
         instances.children.link(asset_group)
-        self.data['task'] = api.Session.get('AVALON_TASK')
+        self.data['task'] = legacy_io.Session.get('AVALON_TASK')
         lib.imprint(asset_group, self.data)
 
         if (self.options or {}).get("useSelection"):

openpype/hosts/blender/plugins/create/create_camera.py

@@ -2,7 +2,7 @@
 
 import bpy
 
-from avalon import api
+from openpype.pipeline import legacy_io
 from openpype.hosts.blender.api import plugin, lib, ops
 from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES
 
@@ -40,7 +40,7 @@ class CreateCamera(plugin.Creator):
         asset_group = bpy.data.objects.new(name=name, object_data=None)
         asset_group.empty_display_type = 'SINGLE_ARROW'
         instances.objects.link(asset_group)
-        self.data['task'] = api.Session.get('AVALON_TASK')
+        self.data['task'] = legacy_io.Session.get('AVALON_TASK')
         print(f"self.data: {self.data}")
         lib.imprint(asset_group, self.data)
 

openpype/hosts/blender/plugins/create/create_layout.py

@@ -2,7 +2,7 @@
 
 import bpy
 
-from avalon import api
+from openpype.pipeline import legacy_io
 from openpype.hosts.blender.api import plugin, lib, ops
 from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES
 
@@ -34,7 +34,7 @@ class CreateLayout(plugin.Creator):
         asset_group = bpy.data.objects.new(name=name, object_data=None)
         asset_group.empty_display_type = 'SINGLE_ARROW'
         instances.objects.link(asset_group)
-        self.data['task'] = api.Session.get('AVALON_TASK')
+        self.data['task'] = legacy_io.Session.get('AVALON_TASK')
         lib.imprint(asset_group, self.data)
 
         # Add selected objects to instance

openpype/hosts/blender/plugins/create/create_model.py

@@ -2,7 +2,7 @@
 
 import bpy
 
-from avalon import api
+from openpype.pipeline import legacy_io
 from openpype.hosts.blender.api import plugin, lib, ops
 from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES
 
@@ -34,7 +34,7 @@ class CreateModel(plugin.Creator):
         asset_group = bpy.data.objects.new(name=name, object_data=None)
         asset_group.empty_display_type = 'SINGLE_ARROW'
         instances.objects.link(asset_group)
-        self.data['task'] = api.Session.get('AVALON_TASK')
+        self.data['task'] = legacy_io.Session.get('AVALON_TASK')
         lib.imprint(asset_group, self.data)
 
         # Add selected objects to instance

openpype/hosts/blender/plugins/create/create_pointcache.py

@@ -2,7 +2,7 @@
 
 import bpy
 
-from avalon import api
+from openpype.pipeline import legacy_io
 import openpype.hosts.blender.api.plugin
 from openpype.hosts.blender.api import lib
 
@@ -22,7 +22,7 @@ class CreatePointcache(openpype.hosts.blender.api.plugin.Creator):
         name = openpype.hosts.blender.api.plugin.asset_name(asset, subset)
         collection = bpy.data.collections.new(name=name)
         bpy.context.scene.collection.children.link(collection)
-        self.data['task'] = api.Session.get('AVALON_TASK')
+        self.data['task'] = legacy_io.Session.get('AVALON_TASK')
         lib.imprint(collection, self.data)
 
         if (self.options or {}).get("useSelection"):

openpype/hosts/blender/plugins/create/create_rig.py

@@ -2,7 +2,7 @@
 
 import bpy
 
-from avalon import api
+from openpype.pipeline import legacy_io
 from openpype.hosts.blender.api import plugin, lib, ops
 from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES
 
@@ -34,7 +34,7 @@ class CreateRig(plugin.Creator):
         asset_group = bpy.data.objects.new(name=name, object_data=None)
         asset_group.empty_display_type = 'SINGLE_ARROW'
         instances.objects.link(asset_group)
-        self.data['task'] = api.Session.get('AVALON_TASK')
+        self.data['task'] = legacy_io.Session.get('AVALON_TASK')
         lib.imprint(asset_group, self.data)
 
         # Add selected objects to instance

openpype/hosts/blender/plugins/publish/extract_layout.py

@@ -7,7 +7,7 @@ import bpy
 import bpy_extras
 import bpy_extras.anim_utils
 
-from avalon import io
+from openpype.pipeline import legacy_io
 from openpype.hosts.blender.api import plugin
 from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY
 import openpype.api
@@ -139,7 +139,7 @@ class ExtractLayout(openpype.api.Extractor):
 
             self.log.debug("Parent: {}".format(parent))
             # Get blend reference
-            blend = io.find_one(
+            blend = legacy_io.find_one(
                 {
                     "type": "representation",
                     "parent": ObjectId(parent),
@@ -150,7 +150,7 @@ class ExtractLayout(openpype.api.Extractor):
             if blend:
                 blend_id = blend["_id"]
             # Get fbx reference
-            fbx = io.find_one(
+            fbx = legacy_io.find_one(
                 {
                     "type": "representation",
                     "parent": ObjectId(parent),
@@ -161,7 +161,7 @@ class ExtractLayout(openpype.api.Extractor):
             if fbx:
                 fbx_id = fbx["_id"]
             # Get abc reference
-            abc = io.find_one(
+            abc = legacy_io.find_one(
                 {
                     "type": "representation",
                     "parent": ObjectId(parent),

openpype/hosts/blender/plugins/publish/integrate_animation.py

@@ -1,6 +1,5 @@
 import json
 
-from avalon import io
 import pyblish.api