mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-25 21:32:15 +01:00
* General: Connect to AYON server (base) (#3924) * implemented 'get_workfile_info' in entities * removed 'prepare_asset_update_data' which is not used * disable settings and project manager if in v4 mode * prepared conversion helper functions for v4 entities * prepared conversion functions for hero versions * fix hero versions * implemented get_archived_representations * fix get latest versions * return prepared changes * handle archived representation * raise exception on failed json conversion * map archived to active properly * make sure default fields are added * fix conversion of hero version entity * fix conversion of archived representations * fix some conversions of representations and versions * changed active behavior in queries * fixed hero versions * implemented basic thumbnail caching * added raw variants of crud methods * implemented methods to get and create thumbnail * fix from flat dict * implemented some basic folder conversion for updates * fix thumbnail updates for version * implemented v4 thumbnail integrator * simplified data mapping * 'get_thumbnail' function also expect entity type and entity id for which is the thumbnail received * implemented 'get_thumbnail' for server * fix how thumbnail id is received from entity * removed unnecessary method 'get_thumbnail_id_from_source' * implemented thumbnail resolver for v4 * removed unnecessary print * move create and delete project directly to server api * disable local settings action too on v4 * OP-3521 - added method to check and download updated addons from v4 server * OP-3521 - added more descriptive error message for missing source * OP-3521 - added default implementation of addon downloader to import * OP-3521 - added check for dependency package zips WIP - server doesn't contain required endpoint. Testing only with mockup data for now. * OP-3521 - fixed parsing of DependencyItem Added Server Url type and ServerAddonDownloader - v4 server doesn't know its own DNS for static files so it is sending unique name and url must be created during runtime. * OP-3521 - fixed creation of targed directories * change nev keys to look for and don't set them automatically * fix task type conversion * implemented base of loading v4 addons in v3 * Refactored argument name in Downloaders * Updated parsing to DependencyItem according to current schema * Implemented downloading of package from server * Updated resolving of failures Uses Enum items. * Introduced passing of authorization token Better to inject it than to have it from env var. * Remove weird parsing of server_url Not necessary, endpoints have same prefix. * Fix doubling asset version name in addons folder Zip file should already contain `addonName_addonVersion` as first subfolder * Fix doubling asset version name in addons folder Zip file should already contain `addonName_addonVersion` as first subfolder * Made server_endpoint optional Argument should be better for testing, but for calling from separate methods it would be better to encapsulate it. Removed unwanted temporary productionPackage value * Use existing method to pull addon info from Server to load v4 version of addon * Raise exception when server doesn't have any production dependency package * added ability to specify v3 alias of addon name * expect v3_alias as uppered constant * Re-implemented method to get addon info Previous implementation wouldn't work in Python2 hosts. Will be refactored in the future. * fix '__getattr__' * added ayon api to pyproject.toml and lock file * use ayon api in common connection * added mapping for label * use ayon_api in client codebase * separated clearing cache of url and username * bump ayon api version * rename env 'OP4_TEST' to 'USE_AYON_SERVER' * Move and renamend get_addons_info to get_addons_info_as_dict in addon_distribution Should be moved to ayon_api later * Replaced requests calls with ayon_api * Replaced OP4_TEST_ENABLED with AYON_SERVER_ENABLED fixed endpoints * Hound * Hound * OP-3521 - fix wrong key in get_representation_parents parents overloads parents * OP-3521 - changes for v4 of SiteSync addon * OP-3521 - fix names * OP-3521 - remove storing project_name It should be safer to go thorug self.dbcon apparently * OP-3521 - remove unwanted "context["folder"]" can be only in dummy test data * OP-3521 - move site sync loaders to addon * Use only project instead of self.project * OP-3521 - added missed get_progress_for_repre * base of settings conversion script * simplified ayon functions in start.py * added loading of settings from ayon server * added a note about colors * fix global and local settings functions * AvalonMongoDB is not using mongo connection on ayon server enabled * 'get_dynamic_modules_dirs' is not checking system settings for paths in setting * log viewer is disabled when ayon server is enabled * basic logic of enabling/disabled addons * don't use mongo logging if ayon server is enabled * update ayon api * bump ayon api again * use ayon_api to get addons info in modules/base * update ayon api * moved helper functions to get addons and dependencies dir to common functions * Initialization of AddonInfo is not crashing on unkonwn sources * renamed 'DependencyDownloader' to 'AyonServerDownloader' * renamed function 'default_addon_downloader' to 'get_default_addon_downloader' * Added ability to convert 'WebAddonSource' to 'ServerResourceSorce' * missing dependency package on server won't cause crash * data sent to downloaders don't contain ayon specific headers * modified addon distribution to not duplicate 'ayon_api' functionality * fix doubled function defintioin * unzip client file to addon destination * formatting - unify quotes * disable usage of mongo connection if in ayon mode * renamed window.py to login_window.py * added webpublisher settings conversion * added maya conversion function * reuse variable * reuse variable (similar to previous commit) * fix ayon addons loading * fix typo 'AyonSettingsCahe' -> 'AyonSettingsCache' * fix enabled state changes * fix rr_path in royal render conversion * avoid mongo calls in AYON state * implemented custom AYON start script * fix formatting (after black) * ayon_start cleanup * 'get_addons_dir' and 'get_dependencies_dir' store value to environment variable * add docstrings to local dir functions * addon info has full name * fix modules enabled states * removed unused 'run_disk_mapping_commands' * removed ayon logic from 'start.py' * fix warning message * renamed 'openpype_common' to 'ayon_common' * removed unused import * don't import igniter * removed startup validations of third parties * change what's shown in version info * fix which keys are applied from ayon values * fix method name * get applications from attribs * Implemented UI basics to be able change user or logout * merged server.py and credentials.py * add more metadata to urls * implemented change token * implemented change user ui functionality * implemented change user ui * modify window to handle username and token value * pass username to add server * fix show UI cases * added loggin action to tray * update ayon api * added missing dependency * convert applications to config in a right way * initial implementation of 'nuke' settings conversion * removed few nuke comments * implemented hiero conversion * added imageio conversion * added run ayon tray script * fix few settings conversions * Renamed class of source classes as they are not just for addons * implemented objec to track source transfer progress * Implemented distribution item with multiple sources * Implemented ayon distribution wrapper to care about multiple things during distribution * added 'cleanup' method for downlaoders * download gets tranfer progress object * Change UploadState enum * added missing imports * use AyonDistribution in ayon_start.py * removed unused functions * removed implemented TODOs * fix import * fix key used for Web source * removed temp development fix * formatting fix * keep information if source require distribution * handle 'require_distribution' attribute in distribution process * added path attribute to server source * added option to pass addons infor to ayon distribution * fix tests * fix formatting * Fix typo * Fix typo * remove '_try_convert_to_server_source' * renamed attributes and methods to match their content * it is possible to pass dependency package info to AyonDistribution * fix called methods in tests * added public properties for error message and error detail * Added filename to WebSourceInfo Useful for GDrive sharable links where target file name is unknown/unparsable, it should be provided explicitly. * unify source conversion by adding 'convert_source' function * Fix error message Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> * added docstring for 'transfer_progress' * don't create metadata file on read * added few docstrings * add default folder fields to folder/task queries * fix generators * add dependencies when runnign from code * add sys paths from distribution to pythonpath env * fix missing applications * added missing conversions for maya renderers * fix formatting * update ayon api * fix hashes in lock file * Use better exception Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com> * Use Python 3 syntax Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com> * apply some of sugested changes in ayon_start * added some docstrings and suggested modifications * copy create env from develop * fix rendersettings conversion * change code by suggestions * added missing args to docstring * added missing docstrings * separated downloader and download factory * fix ayon settings * added some basic file docstring to ayon_settings * join else conditions * fix project settings conversion * fix created at conversion * fix workfile info query * fix publisher UI * added utils function 'get_ayon_appdirs' * fix 'get_all_current_info' * fix server url assignment when url is set * updated ayon api * added utils functions to create local site id for ayon * added helper functions to create global connection * create global connection in ayon start to start use site id * use ayon site id in ayon mode * formatting cleanup * added header docstring * fixes after ayon_api update * load addons from ynput appdirs * fix function call * added docstring * update ayon pyton api * fix settings access * use ayon_api to get root overrides in Anatomy * bumbayon version to 0.1.13 * nuke: fixing settings keys from settings * fix burnins definitions * change v4 to AYON in thumbnail integrate * fix one more v4 information * Fixes after rebase * fix extract burnin conversion * additional fix of extract burnin * SiteSync:added missed loaders or v3 compatibility (#4587) * Added site sync loaders for v3 compatibility * Fix get_progress_for_repre * use 'files.name' instead of 'files.baseName' * update ayon api to 0.1.14 * add common to include files * change arguments for hero version creation * skip shotgrid settings conversion if different ayon addon is used * added ayon icons * fix labels of application variants * added option to show login window always on top * login window on invalid credentials is always on top * update ayon api * update ayon api * add entityType to project and folders * AYON: Editorial hierarchy creation (#4699) * disable extract hierarchy avalon when ayon mode is enabled * implemented extract hierarchy to AYON --------- Co-authored-by: Petr Kalis <petr.kalis@gmail.com> Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com> Co-authored-by: Jakub Jezek <jakubjezek001@gmail.com> * replace 'legacy_io' with context functions in load plugins * added 'get_global_context' to pipeline init * use context getters instead of legacy_io in publish plugins * use data on context instead of 'legacy_io' in submit publish job * skip query of asset docs in collect nuke reads * use context functions on other places * 'list_looks' expects project name * remove 'get_context_title' * don't pass AvalonMongoDB to prelaunch hooks * change how context is calculated in hiero * implemented function 'get_fps_for_current_context' for maya * initialize '_image_dir' and '_image_prefixes' in init * legacy creator is using 'get_current_project_name' * fill docstrings * use context functions in workfile builders * hound fixes * 'create_workspace_mel' can expect project settings * swapped order of arguments * use information from instance/context data * Use self.project_name in workfiles tool Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> * Remove outdated todo Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> * don't query project document in nuke lib * Fix access to context data * Use right function to get project name Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> * fix submit max deadline and swap order of arguments * added 'get_context_label' to nuke * fix import * fix typo 'curent_context' -> 'current_context' * fix project_setting variable * fix submit publish job environments * use task from context * Removed unused import --------- Co-authored-by: Petr Kalis <petr.kalis@gmail.com> Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com> Co-authored-by: Jakub Jezek <jakubjezek001@gmail.com>
358 lines
11 KiB
Python
358 lines
11 KiB
Python
import os
|
|
import re
|
|
import logging
|
|
|
|
try:
|
|
from pxr import Usd, UsdGeom, Sdf, Kind
|
|
except ImportError:
|
|
# Allow to fall back on Multiverse 6.3.0+ pxr usd library
|
|
from mvpxr import Usd, UsdGeom, Sdf, Kind
|
|
|
|
from openpype.client import get_project, get_asset_by_name
|
|
from openpype.pipeline import Anatomy, get_current_project_name
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
# The predefined steps order used for bootstrapping USD Shots and Assets.
|
|
# These are ordered in order from strongest to weakest opinions, like in USD.
|
|
PIPELINE = {
|
|
"shot": [
|
|
"usdLighting",
|
|
"usdFx",
|
|
"usdSimulation",
|
|
"usdAnimation",
|
|
"usdLayout",
|
|
],
|
|
"asset": ["usdShade", "usdModel"],
|
|
}
|
|
|
|
|
|
def create_asset(
|
|
filepath, asset_name, reference_layers, kind=Kind.Tokens.component
|
|
):
|
|
"""
|
|
Creates an asset file that consists of a top level layer and sublayers for
|
|
shading and geometry.
|
|
|
|
Args:
|
|
filepath (str): Filepath where the asset.usd file will be saved.
|
|
reference_layers (list): USD Files to reference in the asset.
|
|
Note that the bottom layer (first file, like a model) would
|
|
be last in the list. The strongest layer will be the first
|
|
index.
|
|
asset_name (str): The name for the Asset identifier and default prim.
|
|
kind (pxr.Kind): A USD Kind for the root asset.
|
|
|
|
"""
|
|
# Also see create_asset.py in PixarAnimationStudios/USD endToEnd example
|
|
|
|
log.info("Creating asset at %s", filepath)
|
|
|
|
# Make the layer ascii - good for readability, plus the file is small
|
|
root_layer = Sdf.Layer.CreateNew(filepath, args={"format": "usda"})
|
|
stage = Usd.Stage.Open(root_layer)
|
|
|
|
# Define a prim for the asset and make it the default for the stage.
|
|
asset_prim = UsdGeom.Xform.Define(stage, "/%s" % asset_name).GetPrim()
|
|
stage.SetDefaultPrim(asset_prim)
|
|
|
|
# Let viewing applications know how to orient a free camera properly
|
|
UsdGeom.SetStageUpAxis(stage, UsdGeom.Tokens.y)
|
|
|
|
# Usually we will "loft up" the kind authored into the exported geometry
|
|
# layer rather than re-stamping here; we'll leave that for a later
|
|
# tutorial, and just be explicit here.
|
|
model = Usd.ModelAPI(asset_prim)
|
|
if kind:
|
|
model.SetKind(kind)
|
|
|
|
model.SetAssetName(asset_name)
|
|
model.SetAssetIdentifier("%s/%s.usd" % (asset_name, asset_name))
|
|
|
|
# Add references to the asset prim
|
|
references = asset_prim.GetReferences()
|
|
for reference_filepath in reference_layers:
|
|
references.AddReference(reference_filepath)
|
|
|
|
stage.GetRootLayer().Save()
|
|
|
|
|
|
def create_shot(filepath, layers, create_layers=False):
|
|
"""Create a shot with separate layers for departments.
|
|
|
|
Args:
|
|
filepath (str): Filepath where the asset.usd file will be saved.
|
|
layers (str): When provided this will be added verbatim in the
|
|
subLayerPaths layers. When the provided layer paths do not exist
|
|
they are generated using Sdf.Layer.CreateNew
|
|
create_layers (bool): Whether to create the stub layers on disk if
|
|
they do not exist yet.
|
|
|
|
Returns:
|
|
str: The saved shot file path
|
|
|
|
"""
|
|
# Also see create_shot.py in PixarAnimationStudios/USD endToEnd example
|
|
|
|
stage = Usd.Stage.CreateNew(filepath)
|
|
log.info("Creating shot at %s" % filepath)
|
|
|
|
for layer_path in layers:
|
|
if create_layers and not os.path.exists(layer_path):
|
|
# We use the Sdf API here to quickly create layers. Also, we're
|
|
# using it as a way to author the subLayerPaths as there is no
|
|
# way to do that directly in the Usd API.
|
|
layer_folder = os.path.dirname(layer_path)
|
|
if not os.path.exists(layer_folder):
|
|
os.makedirs(layer_folder)
|
|
|
|
Sdf.Layer.CreateNew(layer_path)
|
|
|
|
stage.GetRootLayer().subLayerPaths.append(layer_path)
|
|
|
|
# Lets viewing applications know how to orient a free camera properly
|
|
UsdGeom.SetStageUpAxis(stage, UsdGeom.Tokens.y)
|
|
stage.GetRootLayer().Save()
|
|
|
|
return filepath
|
|
|
|
|
|
def create_model(filename, asset, variant_subsets):
|
|
"""Create a USD Model file.
|
|
|
|
For each of the variation paths it will payload the path and set its
|
|
relevant variation name.
|
|
|
|
"""
|
|
|
|
project_name = get_current_project_name()
|
|
asset_doc = get_asset_by_name(project_name, asset)
|
|
assert asset_doc, "Asset not found: %s" % asset
|
|
|
|
variants = []
|
|
for subset in variant_subsets:
|
|
prefix = "usdModel"
|
|
if subset.startswith(prefix):
|
|
# Strip off `usdModel_`
|
|
variant = subset[len(prefix):]
|
|
else:
|
|
raise ValueError(
|
|
"Model subsets must start " "with usdModel: %s" % subset
|
|
)
|
|
|
|
path = get_usd_master_path(
|
|
asset=asset_doc, subset=subset, representation="usd"
|
|
)
|
|
variants.append((variant, path))
|
|
|
|
stage = _create_variants_file(
|
|
filename,
|
|
variants=variants,
|
|
variantset="model",
|
|
variant_prim="/root",
|
|
reference_prim="/root/geo",
|
|
as_payload=True,
|
|
)
|
|
|
|
UsdGeom.SetStageMetersPerUnit(stage, 1)
|
|
UsdGeom.SetStageUpAxis(stage, UsdGeom.Tokens.y)
|
|
|
|
# modelAPI = Usd.ModelAPI(root_prim)
|
|
# modelAPI.SetKind(Kind.Tokens.component)
|
|
|
|
# See http://openusd.org/docs/api/class_usd_model_a_p_i.html#details
|
|
# for more on assetInfo
|
|
# modelAPI.SetAssetName(asset)
|
|
# modelAPI.SetAssetIdentifier(asset)
|
|
|
|
stage.GetRootLayer().Save()
|
|
|
|
|
|
def create_shade(filename, asset, variant_subsets):
|
|
"""Create a master USD shade file for an asset.
|
|
|
|
For each available model variation this should generate a reference
|
|
to a `usdShade_{modelVariant}` subset.
|
|
|
|
"""
|
|
|
|
project_name = get_current_project_name()
|
|
asset_doc = get_asset_by_name(project_name, asset)
|
|
assert asset_doc, "Asset not found: %s" % asset
|
|
|
|
variants = []
|
|
|
|
for subset in variant_subsets:
|
|
prefix = "usdModel"
|
|
if subset.startswith(prefix):
|
|
# Strip off `usdModel_`
|
|
variant = subset[len(prefix):]
|
|
else:
|
|
raise ValueError(
|
|
"Model subsets must start " "with usdModel: %s" % subset
|
|
)
|
|
|
|
shade_subset = re.sub("^usdModel", "usdShade", subset)
|
|
path = get_usd_master_path(
|
|
asset=asset_doc, subset=shade_subset, representation="usd"
|
|
)
|
|
variants.append((variant, path))
|
|
|
|
stage = _create_variants_file(
|
|
filename, variants=variants, variantset="model", variant_prim="/root"
|
|
)
|
|
|
|
stage.GetRootLayer().Save()
|
|
|
|
|
|
def create_shade_variation(filename, asset, model_variant, shade_variants):
|
|
"""Create the master Shade file for a specific model variant.
|
|
|
|
This should reference all shade variants for the specific model variant.
|
|
|
|
"""
|
|
|
|
project_name = get_current_project_name()
|
|
asset_doc = get_asset_by_name(project_name, asset)
|
|
assert asset_doc, "Asset not found: %s" % asset
|
|
|
|
variants = []
|
|
for variant in shade_variants:
|
|
subset = "usdShade_{model}_{shade}".format(
|
|
model=model_variant, shade=variant
|
|
)
|
|
path = get_usd_master_path(
|
|
asset=asset_doc, subset=subset, representation="usd"
|
|
)
|
|
variants.append((variant, path))
|
|
|
|
stage = _create_variants_file(
|
|
filename, variants=variants, variantset="shade", variant_prim="/root"
|
|
)
|
|
|
|
stage.GetRootLayer().Save()
|
|
|
|
|
|
def _create_variants_file(
|
|
filename,
|
|
variants,
|
|
variantset,
|
|
default_variant=None,
|
|
variant_prim="/root",
|
|
reference_prim=None,
|
|
set_default_variant=True,
|
|
as_payload=False,
|
|
skip_variant_on_single_file=True,
|
|
):
|
|
|
|
root_layer = Sdf.Layer.CreateNew(filename, args={"format": "usda"})
|
|
stage = Usd.Stage.Open(root_layer)
|
|
|
|
root_prim = stage.DefinePrim(variant_prim)
|
|
stage.SetDefaultPrim(root_prim)
|
|
|
|
def _reference(path):
|
|
"""Reference/Payload path depending on function arguments"""
|
|
|
|
if reference_prim:
|
|
prim = stage.DefinePrim(reference_prim)
|
|
else:
|
|
prim = root_prim
|
|
|
|
if as_payload:
|
|
# Payload
|
|
prim.GetPayloads().AddPayload(Sdf.Payload(path))
|
|
else:
|
|
# Reference
|
|
prim.GetReferences().AddReference(Sdf.Reference(path))
|
|
|
|
assert variants, "Must have variants, got: %s" % variants
|
|
|
|
log.info(filename)
|
|
|
|
if skip_variant_on_single_file and len(variants) == 1:
|
|
# Reference directly, no variants
|
|
variant_path = variants[0][1]
|
|
_reference(variant_path)
|
|
|
|
log.info("Non-variants..")
|
|
log.info("Path: %s" % variant_path)
|
|
|
|
else:
|
|
# Variants
|
|
append = Usd.ListPositionBackOfAppendList
|
|
variant_set = root_prim.GetVariantSets().AddVariantSet(
|
|
variantset, append
|
|
)
|
|
|
|
for variant, variant_path in variants:
|
|
|
|
if default_variant is None:
|
|
default_variant = variant
|
|
|
|
variant_set.AddVariant(variant, append)
|
|
variant_set.SetVariantSelection(variant)
|
|
with variant_set.GetVariantEditContext():
|
|
_reference(variant_path)
|
|
|
|
log.info("Variants..")
|
|
log.info("Variant: %s" % variant)
|
|
log.info("Path: %s" % variant_path)
|
|
|
|
if set_default_variant:
|
|
variant_set.SetVariantSelection(default_variant)
|
|
|
|
return stage
|
|
|
|
|
|
def get_usd_master_path(asset, subset, representation):
|
|
"""Get the filepath for a .usd file of a subset.
|
|
|
|
This will return the path to an unversioned master file generated by
|
|
`usd_master_file.py`.
|
|
|
|
"""
|
|
|
|
project_name = get_current_project_name()
|
|
anatomy = Anatomy(project_name)
|
|
project_doc = get_project(
|
|
project_name,
|
|
fields=["name", "data.code"]
|
|
)
|
|
|
|
if isinstance(asset, dict) and "name" in asset:
|
|
# Allow explicitly passing asset document
|
|
asset_doc = asset
|
|
else:
|
|
asset_doc = get_asset_by_name(project_name, asset, fields=["name"])
|
|
|
|
template_obj = anatomy.templates_obj["publish"]["path"]
|
|
path = template_obj.format_strict(
|
|
{
|
|
"project": {
|
|
"name": project_name,
|
|
"code": project_doc.get("data", {}).get("code")
|
|
},
|
|
"asset": asset_doc["name"],
|
|
"subset": subset,
|
|
"representation": representation,
|
|
"version": 0, # stub version zero
|
|
}
|
|
)
|
|
|
|
# Remove the version folder
|
|
subset_folder = os.path.dirname(os.path.dirname(path))
|
|
master_folder = os.path.join(subset_folder, "master")
|
|
fname = "{0}.{1}".format(subset, representation)
|
|
|
|
return os.path.join(master_folder, fname).replace("\\", "/")
|
|
|
|
|
|
def parse_avalon_uri(uri):
|
|
# URI Pattern: avalon://{asset}/{subset}.{ext}
|
|
pattern = r"avalon://(?P<asset>[^/.]*)/(?P<subset>[^/]*)\.(?P<ext>.*)"
|
|
if uri.startswith("avalon://"):
|
|
match = re.match(pattern, uri)
|
|
if match:
|
|
return match.groupdict()
|