mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 08:24:53 +01:00
use 'OpenPypeMongoConnection' from 'openpype.client'
This commit is contained in:
parent
ccbc18fd82
commit
308d9e9c49
13 changed files with 21 additions and 20 deletions
|
|
@ -6,7 +6,7 @@ Shader names are stored as simple text file over GridFS in mongodb.
|
||||||
"""
|
"""
|
||||||
import os
|
import os
|
||||||
from Qt import QtWidgets, QtCore, QtGui
|
from Qt import QtWidgets, QtCore, QtGui
|
||||||
from openpype.lib.mongo import OpenPypeMongoConnection
|
from openpype.client.mongo import OpenPypeMongoConnection
|
||||||
from openpype import resources
|
from openpype import resources
|
||||||
import gridfs
|
import gridfs
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ from openpype.pipeline import legacy_io
|
||||||
import openpype.hosts.maya.api.action
|
import openpype.hosts.maya.api.action
|
||||||
from openpype.hosts.maya.api.shader_definition_editor import (
|
from openpype.hosts.maya.api.shader_definition_editor import (
|
||||||
DEFINITION_FILENAME)
|
DEFINITION_FILENAME)
|
||||||
from openpype.lib.mongo import OpenPypeMongoConnection
|
from openpype.client.mongo import OpenPypeMongoConnection
|
||||||
import gridfs
|
import gridfs
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,9 @@ from aiohttp.web_response import Response
|
||||||
from openpype.client import (
|
from openpype.client import (
|
||||||
get_projects,
|
get_projects,
|
||||||
get_assets,
|
get_assets,
|
||||||
|
OpenPypeMongoConnection,
|
||||||
)
|
)
|
||||||
from openpype.lib import (
|
from openpype.lib import (
|
||||||
OpenPypeMongoConnection,
|
|
||||||
PypeLogger,
|
PypeLogger,
|
||||||
)
|
)
|
||||||
from openpype.lib.remote_publish import (
|
from openpype.lib.remote_publish import (
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import requests
|
||||||
import json
|
import json
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
|
from openpype.client import OpenPypeMongoConnection
|
||||||
from openpype.lib import PypeLogger
|
from openpype.lib import PypeLogger
|
||||||
|
|
||||||
from .webpublish_routes import (
|
from .webpublish_routes import (
|
||||||
|
|
@ -121,8 +122,6 @@ def run_webserver(*args, **kwargs):
|
||||||
|
|
||||||
def reprocess_failed(upload_dir, webserver_url):
|
def reprocess_failed(upload_dir, webserver_url):
|
||||||
# log.info("check_reprocesable_records")
|
# log.info("check_reprocesable_records")
|
||||||
from openpype.lib import OpenPypeMongoConnection
|
|
||||||
|
|
||||||
mongo_client = OpenPypeMongoConnection.get_mongo_client()
|
mongo_client = OpenPypeMongoConnection.get_mongo_client()
|
||||||
database_name = os.environ["OPENPYPE_DATABASE_NAME"]
|
database_name = os.environ["OPENPYPE_DATABASE_NAME"]
|
||||||
dbcon = mongo_client[database_name]["webpublishes"]
|
dbcon = mongo_client[database_name]["webpublishes"]
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ from openpype.settings import (
|
||||||
get_system_settings
|
get_system_settings
|
||||||
)
|
)
|
||||||
|
|
||||||
from .import validate_mongo_connection
|
from openpype.client.mongo import validate_mongo_connection
|
||||||
|
|
||||||
_PLACEHOLDER = object()
|
_PLACEHOLDER = object()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,13 @@ import traceback
|
||||||
import threading
|
import threading
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
from . import Terminal
|
from openpype.client.mongo import (
|
||||||
from .mongo import (
|
|
||||||
MongoEnvNotSet,
|
MongoEnvNotSet,
|
||||||
get_default_components,
|
get_default_components,
|
||||||
OpenPypeMongoConnection
|
OpenPypeMongoConnection,
|
||||||
)
|
)
|
||||||
|
from . import Terminal
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import log4mongo
|
import log4mongo
|
||||||
from log4mongo.handlers import MongoHandler
|
from log4mongo.handlers import MongoHandler
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ from bson.objectid import ObjectId
|
||||||
import pyblish.util
|
import pyblish.util
|
||||||
import pyblish.api
|
import pyblish.api
|
||||||
|
|
||||||
from openpype.lib.mongo import OpenPypeMongoConnection
|
from openpype.client.mongo import OpenPypeMongoConnection
|
||||||
from openpype.lib.plugin_tools import parse_json
|
from openpype.lib.plugin_tools import parse_json
|
||||||
|
|
||||||
ERROR_STATUS = "error"
|
ERROR_STATUS = "error"
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,9 @@
|
||||||
import os
|
import os
|
||||||
import sys
|
|
||||||
import signal
|
import signal
|
||||||
import datetime
|
import datetime
|
||||||
import subprocess
|
import subprocess
|
||||||
import socket
|
import socket
|
||||||
import json
|
import json
|
||||||
import platform
|
|
||||||
import getpass
|
import getpass
|
||||||
import atexit
|
import atexit
|
||||||
import time
|
import time
|
||||||
|
|
@ -13,12 +11,14 @@ import uuid
|
||||||
|
|
||||||
import ftrack_api
|
import ftrack_api
|
||||||
import pymongo
|
import pymongo
|
||||||
|
from openpype.client.mongo import (
|
||||||
|
OpenPypeMongoConnection,
|
||||||
|
validate_mongo_connection,
|
||||||
|
)
|
||||||
from openpype.lib import (
|
from openpype.lib import (
|
||||||
get_openpype_execute_args,
|
get_openpype_execute_args,
|
||||||
OpenPypeMongoConnection,
|
|
||||||
get_openpype_version,
|
get_openpype_version,
|
||||||
get_build_version,
|
get_build_version,
|
||||||
validate_mongo_connection
|
|
||||||
)
|
)
|
||||||
from openpype_modules.ftrack import FTRACK_MODULE_DIR
|
from openpype_modules.ftrack import FTRACK_MODULE_DIR
|
||||||
from openpype_modules.ftrack.lib import credentials
|
from openpype_modules.ftrack.lib import credentials
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ except ImportError:
|
||||||
from ftrack_api._weakref import WeakMethod
|
from ftrack_api._weakref import WeakMethod
|
||||||
from openpype_modules.ftrack.lib import get_ftrack_event_mongo_info
|
from openpype_modules.ftrack.lib import get_ftrack_event_mongo_info
|
||||||
|
|
||||||
from openpype.lib import OpenPypeMongoConnection
|
from openpype.client import OpenPypeMongoConnection
|
||||||
from openpype.api import Logger
|
from openpype.api import Logger
|
||||||
|
|
||||||
TOPIC_STATUS_SERVER = "openpype.event.server.status"
|
TOPIC_STATUS_SERVER = "openpype.event.server.status"
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,8 @@ import socket
|
||||||
import pymongo
|
import pymongo
|
||||||
|
|
||||||
import ftrack_api
|
import ftrack_api
|
||||||
|
|
||||||
|
from openpype.client import OpenPypeMongoConnection
|
||||||
from openpype_modules.ftrack.ftrack_server.ftrack_server import FtrackServer
|
from openpype_modules.ftrack.ftrack_server.ftrack_server import FtrackServer
|
||||||
from openpype_modules.ftrack.ftrack_server.lib import (
|
from openpype_modules.ftrack.ftrack_server.lib import (
|
||||||
SocketSession,
|
SocketSession,
|
||||||
|
|
@ -15,7 +17,6 @@ from openpype_modules.ftrack.ftrack_server.lib import (
|
||||||
)
|
)
|
||||||
from openpype_modules.ftrack.lib import get_ftrack_event_mongo_info
|
from openpype_modules.ftrack.lib import get_ftrack_event_mongo_info
|
||||||
from openpype.lib import (
|
from openpype.lib import (
|
||||||
OpenPypeMongoConnection,
|
|
||||||
get_openpype_version,
|
get_openpype_version,
|
||||||
get_build_version
|
get_build_version
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ import pyblish.api
|
||||||
import copy
|
import copy
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
from openpype.client import OpenPypeMongoConnection
|
||||||
from openpype.lib.plugin_tools import prepare_template_data
|
from openpype.lib.plugin_tools import prepare_template_data
|
||||||
from openpype.lib import OpenPypeMongoConnection
|
|
||||||
|
|
||||||
|
|
||||||
class IntegrateSlackAPI(pyblish.api.InstancePlugin):
|
class IntegrateSlackAPI(pyblish.api.InstancePlugin):
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,8 @@ import logging
|
||||||
import pymongo
|
import pymongo
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
|
from openpype.client import OpenPypeMongoConnection
|
||||||
|
|
||||||
from . import schema
|
from . import schema
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -156,8 +158,6 @@ class AvalonMongoDB:
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def mongo_client(self):
|
def mongo_client(self):
|
||||||
from openpype.lib import OpenPypeMongoConnection
|
|
||||||
|
|
||||||
return OpenPypeMongoConnection.get_mongo_client()
|
return OpenPypeMongoConnection.get_mongo_client()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ from abc import ABCMeta, abstractmethod
|
||||||
import six
|
import six
|
||||||
|
|
||||||
import openpype.version
|
import openpype.version
|
||||||
|
from openpype.client.mongo import OpenPypeMongoConnection
|
||||||
|
|
||||||
from .constants import (
|
from .constants import (
|
||||||
GLOBAL_SETTINGS_KEY,
|
GLOBAL_SETTINGS_KEY,
|
||||||
|
|
@ -337,7 +338,6 @@ class MongoSettingsHandler(SettingsHandler):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
# Get mongo connection
|
# Get mongo connection
|
||||||
from openpype.lib import OpenPypeMongoConnection
|
|
||||||
from openpype.pipeline import AvalonMongoDB
|
from openpype.pipeline import AvalonMongoDB
|
||||||
|
|
||||||
settings_collection = OpenPypeMongoConnection.get_mongo_client()
|
settings_collection = OpenPypeMongoConnection.get_mongo_client()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue