Merge pull request #3596 from pypeclub/feature/OP-3503_Use-query-functions-in-general-code

General: Use query functions in general code

openpype/hooks/pre_global_host_data.py

@@ -1,3 +1,4 @@
+from openpype.client import get_project, get_asset_by_name
 from openpype.lib import (
     PreLaunchHook,
     EnvironmentPrepData,
@@ -69,7 +70,7 @@ class GlobalHostDataHook(PreLaunchHook):
         self.data["dbcon"] = dbcon
 
         # Project document
-        project_doc = dbcon.find_one({"type": "project"})
+        project_doc = get_project(project_name)
         self.data["project_doc"] = project_doc
 
         asset_name = self.data.get("asset_name")
@@ -79,8 +80,5 @@ class GlobalHostDataHook(PreLaunchHook):
             )
             return
 
-        asset_doc = dbcon.find_one({
-            "type": "asset",
-            "name": asset_name
-        })
+        asset_doc = get_asset_by_name(project_name, asset_name)
         self.data["asset_doc"] = asset_doc

openpype/hosts/fusion/scripts/fusion_switch_shot.py

@@ -3,9 +3,7 @@ import re
 import sys
 import logging
 
-# Pipeline imports
 from openpype.client import (
-    get_project,
     get_asset_by_name,
     get_versions,
 )
@@ -21,9 +19,6 @@ from openpype.lib.avalon_context import get_workdir_from_session
 
 log = logging.getLogger("Update Slap Comp")
 
-self = sys.modules[__name__]
-self._project = None
-
 
 def _format_version_folder(folder):
     """Format a version folder based on the filepath
@@ -212,9 +207,6 @@ def switch(asset_name, filepath=None, new=True):
     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 = get_project(project_name)
-
     # Go to comp
     if not filepath:
         current_comp = api.get_current_comp()

openpype/hosts/testhost/api/pipeline.py

@@ -1,6 +1,6 @@
 import os
 import json
-from openpype.pipeline import legacy_io
+from openpype.client import get_asset_by_name
 
 
 class HostContext:
@@ -17,10 +17,10 @@ class HostContext:
         if not asset_name:
             return project_name
 
-        asset_doc = legacy_io.find_one(
-            {"type": "asset", "name": asset_name},
-            {"data.parents": 1}
+        asset_doc = get_asset_by_name(
+            project_name, asset_name, fields=["data.parents"]
         )
+
         parents = asset_doc.get("data", {}).get("parents") or []
 
         hierarchy = [project_name]

openpype/hosts/testhost/plugins/create/auto_creator.py

@@ -1,10 +1,11 @@
 from openpype.lib import NumberDef
-from openpype.hosts.testhost.api import pipeline
+from openpype.client import get_asset_by_name
 from openpype.pipeline import (
     legacy_io,
     AutoCreator,
     CreatedInstance,
 )
+from openpype.hosts.testhost.api import pipeline
 
 
 class MyAutoCreator(AutoCreator):
@@ -44,10 +45,7 @@ class MyAutoCreator(AutoCreator):
         host_name = legacy_io.Session["AVALON_APP"]
 
         if existing_instance is None:
-            asset_doc = legacy_io.find_one({
-                "type": "asset",
-                "name": asset_name
-            })
+            asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
                 variant, task_name, asset_doc, project_name, host_name
             )
@@ -69,10 +67,7 @@ class MyAutoCreator(AutoCreator):
             existing_instance["asset"] != asset_name
             or existing_instance["task"] != task_name
         ):
-            asset_doc = legacy_io.find_one({
-                "type": "asset",
-                "name": asset_name
-            })
+            asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
                 variant, task_name, asset_doc, project_name, host_name
             )

openpype/pipeline/create/context.py

@@ -6,6 +6,7 @@ import inspect
 from uuid import uuid4
 from contextlib import contextmanager
 
+from openpype.client import get_assets
 from openpype.host import INewPublisher
 from openpype.pipeline import legacy_io
 from openpype.pipeline.mongodb import (
@@ -1082,15 +1083,10 @@ class CreateContext:
             for asset_name in task_names_by_asset_name.keys()
             if asset_name is not None
         ]
-        asset_docs = list(self.dbcon.find(
-            {
-                "type": "asset",
-                "name": {"$in": asset_names}
-            },
-            {
-                "name": True,
-                "data.tasks": True
-            }
+        asset_docs = list(get_assets(
+            self.project_name,
+            asset_names=asset_names,
+            fields=["name", "data.tasks"]
         ))
 
         task_names_by_asset_name = {}

openpype/pipeline/thumbnail.py

@@ -2,6 +2,7 @@ import os
 import copy
 import logging
 
+from openpype.client import get_project
 from . import legacy_io
 from .plugin_discover import (
     discover,
@@ -85,13 +86,8 @@ class TemplateResolver(ThumbnailResolver):
             self.log.debug("Thumbnail entity does not have set template")
             return
 
-        project = self.dbcon.find_one(
-            {"type": "project"},
-            {
-                "name": True,
-                "data.code": True
-            }
-        )
+        project_name = self.dbcon.active_project()
+        project = get_project(project_name, fields=["name", "data.code"])
 
         template_data = copy.deepcopy(
             thumbnail_entity["data"].get("template_data") or {}

openpype/scripts/fusion_switch_shot.py

@@ -3,6 +3,8 @@ import re
 import sys
 import logging
 
+from openpype.client import get_asset_by_name, get_versions
+
 # Pipeline imports
 from openpype.hosts.fusion import api
 import openpype.hosts.fusion.api.lib as fusion_lib
@@ -19,9 +21,6 @@ from openpype.lib.avalon_context import get_workdir_from_session
 
 log = logging.getLogger("Update Slap Comp")
 
-self = sys.modules[__name__]
-self._project = None
-
 
 def _format_version_folder(folder):
     """Format a version folder based on the filepath
@@ -131,8 +130,8 @@ 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()
+    versions = list(get_versions(project_name, version_ids=version_ids))
 
     start = min(v["data"]["frameStart"] for v in versions)
     end = max(v["data"]["frameEnd"] for v in versions)
@@ -162,15 +161,10 @@ 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",
-        "name": legacy_io.Session["AVALON_PROJECT"]
-    })
-
     # Go to comp
     if not filepath:
         current_comp = api.get_current_comp()