Merged in hotfix/PYPE-173_catch_avalon_id_conversion (pull request #56)

Hotfix/PYPE-173 catch avalon id conversion

Approved-by: Milan Kolar <milan@orbi.tools>
This commit is contained in:
Jakub Trllo 2019-01-29 10:05:54 +00:00 committed by Milan Kolar
commit 896fddac5b
3 changed files with 18 additions and 9 deletions

View file

@ -177,6 +177,11 @@ def import_to_avalon(
return output
mongo_id = entity['custom_attributes'][ca_mongoid]
mongo_id = mongo_id.replace(' ', '').replace('\n', '')
try:
ObjectId(mongo_id)
except Exception:
mongo_id = ''
if mongo_id is not '':
avalon_asset = database[project_name].find_one(

View file

@ -442,16 +442,20 @@ def get_avalon_asset_template_schema():
def get_avalon_database():
if io._database is None:
project = os.environ.get('AVALON_PROJECT', '')
asset = os.environ.get('AVALON_ASSET', '')
silo = os.environ.get('AVALON_SILO', '')
os.environ['AVALON_PROJECT'] = project
os.environ['AVALON_ASSET'] = asset
os.environ['AVALON_SILO'] = silo
io.install()
set_io_database()
return io._database
def set_io_database():
project = os.environ.get('AVALON_PROJECT', '')
asset = os.environ.get('AVALON_ASSET', '')
silo = os.environ.get('AVALON_SILO', '')
os.environ['AVALON_PROJECT'] = project
os.environ['AVALON_ASSET'] = asset
os.environ['AVALON_SILO'] = silo
io.install()
def get_all_avalon_projects():
db = get_avalon_database()
project_names = db.collection_names()

View file

@ -2,14 +2,14 @@ import os
import re
from avalon import io
from avalon import api as avalon
from . import lib
from app.api import (Templates, Logger, format)
log = Logger.getLogger(__name__,
os.getenv("AVALON_APP", "pype-config"))
SESSION = avalon.session
if not SESSION:
io.install()
lib.set_io_database()
def load_data_from_templates():