Merge pull request #3380 from pypeclub/feature/OP-3380_Use-query-functions-in-Fusion

Fusion: Use client query functions

openpype/hosts/fusion/api/lib.py

@@ -3,9 +3,16 @@ import sys
 import re
 import contextlib
 
-from bson.objectid import ObjectId
 from Qt import QtGui
 
+from openpype.client import (
+    get_asset_by_name,
+    get_subset_by_name,
+    get_last_version_by_subset_id,
+    get_representation_by_id,
+    get_representation_by_name,
+    get_representation_parents,
+)
 from openpype.pipeline import (
     switch_container,
     legacy_io,
@@ -93,13 +100,16 @@ def switch_item(container,
         raise ValueError("Must have at least one change provided to switch.")
 
     # Collect any of current asset, subset and representation if not provided
-    # so we can use the original name from those.
+    #   so we can use the original name from those.
+    project_name = legacy_io.active_project()
     if any(not x for x in [asset_name, subset_name, representation_name]):
-        _id = ObjectId(container["representation"])
-        representation = legacy_io.find_one({
-            "type": "representation", "_id": _id
-        })
-        version, subset, asset, project = legacy_io.parenthood(representation)
+        repre_id = container["representation"]
+        representation = get_representation_by_id(project_name, repre_id)
+        repre_parent_docs = get_representation_parents(representation)
+        if repre_parent_docs:
+            version, subset, asset, _ = repre_parent_docs
+        else:
+            version = subset = asset = None
 
         if asset_name is None:
             asset_name = asset["name"]
@@ -111,39 +121,26 @@ def switch_item(container,
             representation_name = representation["name"]
 
     # Find the new one
-    asset = legacy_io.find_one({
-        "name": asset_name,
-        "type": "asset"
-    })
+    asset = get_asset_by_name(project_name, asset_name, fields=["_id"])
     assert asset, ("Could not find asset in the database with the name "
                    "'%s'" % asset_name)
 
-    subset = legacy_io.find_one({
-        "name": subset_name,
-        "type": "subset",
-        "parent": asset["_id"]
-    })
+    subset = get_subset_by_name(
+        project_name, subset_name, asset["_id"], fields=["_id"]
+    )
     assert subset, ("Could not find subset in the database with the name "
                     "'%s'" % subset_name)
 
-    version = legacy_io.find_one(
-        {
-            "type": "version",
-            "parent": subset["_id"]
-        },
-        sort=[('name', -1)]
+    version = get_last_version_by_subset_id(
+        project_name, subset["_id"], fields=["_id"]
     )
-
     assert version, "Could not find a version for {}.{}".format(
         asset_name, subset_name
     )
 
-    representation = legacy_io.find_one({
-        "name": representation_name,
-        "type": "representation",
-        "parent": version["_id"]}
+    representation = get_representation_by_name(
+        project_name, representation_name, version["_id"]
     )
-
     assert representation, ("Could not find representation in the database "
                             "with the name '%s'" % representation_name)
 

openpype/hosts/fusion/plugins/load/load_sequence.py

@@ -1,6 +1,7 @@
 import os
 import contextlib
 
+from openpype.client import get_version_by_id
 from openpype.pipeline import (
     load,
     legacy_io,
@@ -211,10 +212,8 @@ class FusionLoadSequence(load.LoaderPlugin):
         path = self._get_first_image(root)
 
         # Get start frame from version data
-        version = legacy_io.find_one({
-            "type": "version",
-            "_id": representation["parent"]
-        })
+        project_name = legacy_io.active_project()
+        version = get_version_by_id(project_name, representation["parent"])
         start = version["data"].get("frameStart")
         if start is None:
             self.log.warning("Missing start frame for updated version"

openpype/hosts/fusion/scripts/fusion_switch_shot.py

@@ -4,6 +4,11 @@ import sys
 import logging
 
 # Pipeline imports
+from openpype.client import (
+    get_project,
+    get_asset_by_name,
+    get_versions,
+)
 from openpype.pipeline import (
     legacy_io,
     install_host,
@@ -164,9 +169,9 @@ def update_frame_range(comp, representations):
 
     """
 
-    version_ids = [r["parent"] for r in representations]
-    versions = legacy_io.find({"type": "version", "_id": {"$in": version_ids}})
-    versions = list(versions)
+    project_name = legacy_io.active_project()
+    version_ids = {r["parent"] for r in representations}
+    versions = list(get_versions(project_name, version_ids))
 
     versions = [v for v in versions
                 if v["data"].get("frameStart", None) is not None]
@@ -203,11 +208,12 @@ def switch(asset_name, filepath=None, new=True):
 
     # Assert asset name exists
     # It is better to do this here then to wait till switch_shot does it
-    asset = legacy_io.find_one({"type": "asset", "name": asset_name})
+    project_name = legacy_io.active_project()
+    asset = get_asset_by_name(project_name, asset_name)
     assert asset, "Could not find '%s' in the database" % asset_name
 
     # Get current project
-    self._project = legacy_io.find_one({"type": "project"})
+    self._project = get_project(project_name)
 
     # Go to comp
     if not filepath:

openpype/hosts/fusion/utility_scripts/switch_ui.py

@@ -7,6 +7,7 @@ from Qt import QtWidgets, QtCore
 
 import qtawesome as qta
 
+from openpype.client import get_assets
 from openpype import style
 from openpype.pipeline import (
     install_host,
@@ -142,7 +143,7 @@ class App(QtWidgets.QWidget):
         # Clear any existing items
         self._assets.clear()
 
-        asset_names = [a["name"] for a in self.collect_assets()]
+        asset_names = self.collect_asset_names()
         completer = QtWidgets.QCompleter(asset_names)
 
         self._assets.setCompleter(completer)
@@ -165,8 +166,14 @@ class App(QtWidgets.QWidget):
         items = glob.glob("{}/*.comp".format(directory))
         return items
 
-    def collect_assets(self):
-        return list(legacy_io.find({"type": "asset"}, {"name": True}))
+    def collect_asset_names(self):
+        project_name = legacy_io.active_project()
+        asset_docs = get_assets(project_name, fields=["name"])
+        asset_names = {
+            asset_doc["name"]
+            for asset_doc in asset_docs
+        }
+        return list(asset_names)
 
     def populate_comp_box(self, files):
         """Ensure we display the filename only but the path is stored as well