Commit graph

2467 commits

Author SHA1 Message Date
Roy Nieterau
3ee28bd1aa Avoid selection changes 2023-08-30 14:22:11 +02:00
Roy Nieterau
861b9849cb Ensure we only iterate ai* attributes that come from a plugin 2023-08-30 14:20:56 +02:00
Roy Nieterau
17f83a0ecc Avoid iterating over None if ai attributes for some reason do not exist 2023-08-30 14:17:16 +02:00
Roy Nieterau
0fa081dddb Ignore arnold attribute check if arnold is not loaded 2023-08-30 14:16:27 +02:00
Roy Nieterau
97f9cd4377 Do not warn about renderlayer instance being empty 2023-08-30 14:14:33 +02:00
Roy Nieterau
e9cb011c2a Remove unused attribute 2023-08-30 10:31:06 +02:00
Roy Nieterau
2b951d29f2 Maya: Tweak logging for artist-facing reports in publisher 2023-08-30 09:50:59 +02:00
Petr Kalis
a63fef653d
Context plugin shouldn't be tied to family (#5464) 2023-08-21 10:32:32 +02:00
Petr Kalis
c5d882c7ea
Maya: Fix wrong subset name of render family in deadline (#5442)
* Use existing subset_name as group_name by default

New publisher already carries real subset name (`renderModelingMain`), it should build group name only if subset_name is weird.

* Let legacy conversion of render instance recreate subset_name

Without it would create subset names like `renderingMain` which are not matching to newly created `renderMain` instances. This would cause issue in version restarts.

* Let Render Creator for Maya create proper subset_name

It was using hardcoded logic not matching other DCCs.

* Hound

* Fix method calls

* Fix typos

* Do not import unnecessary

* Capitalize is wrong function for here

* Overwrite get_subset_name for standardized results

It makes sense to override this method for other parts of code getting same results.

* Force change

It seems that GH doesn't recognize changes with adding()

* Update openpype/hosts/maya/plugins/create/convert_legacy.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>

* Hound

---------

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-08-17 10:33:52 +02:00
Petr Kalis
328c3d9c7f
OP-6567 - fix setting of version to workfile instance (#5452)
If there are multiple instances of renderlayer published, previous logic resulted in unpredictable rewrite of instance family to 'workfile'
2023-08-16 16:16:21 +02:00
Petr Kalis
8b128d91bc
Maya: allow not creation of group for Import loaders (#5427)
* OP-6357 - removed unneeded import

* OP-6357 - extracted logic for getting custom group and namespace from Settings

Mimicing logic in ReferenceLoader, eg. group could be left empty >> no groupping of imported subset.

* OP-6357 - same logic for abc animation as Reference

* OP-6357 - same logic for yeti rig as ReferenceLoder

Allows to not create wrapping group.

* OP-6357 - added separate import_loader to settings

Could be used to not creating wrapping groups when Group kept empty.

* OP-6357 - added product subset conversion for ayon settings

* OP-6357 - fix using correct variable

Artist input comes from `data` not directly from self.options

* OP-6357 - add attach_to_root to options to allow control by same key

* OP-6357 - added docstring

* Added settings for Import loaders in maya

* OP-6357 - refactored formatting
2023-08-11 16:12:05 +02:00
Petr Kalis
7d40debd64
Maya: do not create top level group on reference (#5402)
* OP-6358 - allow not creation of group for reference loader in Maya

Creation of wrapping group could be controlled by checkbox in ReferenceLoader options.

* OP-6358 - group name could be empty in Settings

This enables default behavior of not creating wrapping group without need of artists unchecking `Group imported assets`.

* OP-6358 - changed to safer logic

Stripping of | was weird and potentially dangerous (collision of names), this logic should be safer.
2023-08-08 11:00:02 +02:00
Jakub Trllo
ae3eb37776
AYON: Add folder to template data (#5417)
* added 'folder[name]' to template data

* removed asset <-> folder conversion from conversion utils

* use folder[name] in maya namespace
2023-08-07 17:22:28 +02:00
Jakub Trllo
3ae020f064
Applications: Launch hooks cleanup (#5395)
* ApplicationManager can have more granular way how applications are launched

* executable is optional to be able create ApplicationLaunchContext

* launch context can run prelaunch hooks without launching application

* 'get_app_environments_for_context' is using launch context to prepare environments

* added 'launch_type' as one of filtering options for LaunchHook

* added 'local' launch type filter to existing launch hooks

* define 'automated' launch type in remote publish function

* modified publish and extract environments cli commands

* launch types are only for local by default

* fix import

* fix launch types of global host data

* change order or kwargs

* change unreal filter attribute

* use set instead of list

* removed '__init__' from celaction hooks

* use 'CELACTION_ROOT_DIR' in pre setup

* use full import from applications
2023-08-03 12:24:23 +02:00
Jakub Trllo
7e9f42b447
Applications: Use prelaunch hooks to extract environments (#5387)
* ApplicationManager can have more granular way how applications are launched

* executable is optional to be able create ApplicationLaunchContext

* launch context can run prelaunch hooks without launching application

* 'get_app_environments_for_context' is using launch context to prepare environments

* added 'launch_type' as one of filtering options for LaunchHook

* added 'local' launch type filter to existing launch hooks

* define 'automated' launch type in remote publish function

* modified publish and extract environments cli commands

* launch types are only for local by default

* fix import

* fix launch types of global host data

* change order or kwargs

* change unreal filter attribute
2023-08-03 10:04:15 +02:00
Jakub Trllo
6196ded1a9
Chore: Python 2 support fix (#5375)
* remove f-string formatting

* added python 2 compatible click into python 2 vendor
2023-08-01 10:46:59 +02:00
Mustafa Zarkash
40037b050c
update defaults variables (#5368) 2023-07-31 15:01:18 +02:00
Milan Kolar
f22d28808b
Merge pull request #5336 from tokejepsen/bugfix/maya_validate_model_content 2023-07-31 09:51:47 +02:00
Milan Kolar
6deace97d6
Merge pull request #5296 from ynput/bugfix/maya_validate_frame_rang_fix 2023-07-27 22:56:33 +02:00
Jakub Trllo
d63aa34a76
AYON: 3rd party addon usage (#5300)
* implemented helper functions to get ffmpeg and oiio tool arguments

* modified validation functions to be able to handle list of arguments

* path getters can return a path in AYON mode if one argument is returned

* removed test exception

* modified docstrings

* is_oiio_supported is using new functions to get launch arguments

* new functions are in lib public =

* use new functions all over the place

* renamed 'ffmpeg_path' to 'ffmpeg_args'

* raise 'ToolNotFoundError' if tool argument could not be found

* reraise 'KnownPublishError' in publish plugins

* fix comment

* simplify args start

* ffmpeg and oiio function require tool name and support additional arguments

* renamed 'get_oiio_tools_args' to 'get_oiio_tool_args'

* fix variable name
2023-07-27 10:54:45 +02:00
Milan Kolar
45f0fcff00
Merge pull request #5310 from quadproduction/enhancement/522-error-on-multiple-instance-rig-publication 2023-07-27 10:04:39 +02:00
Milan Kolar
93260948bf
Merge pull request #5297 from tokejepsen/bugfix/maya_include_disabled_plugins 2023-07-27 09:55:53 +02:00
Milan Kolar
0b58144f2c
Merge pull request #5303 from tokejepsen/bugfix/maya_creators_apply_settings 2023-07-27 09:14:43 +02:00
Toke Jepsen
503e049dd9
Fix rig selection sets naming (#539) 2023-07-24 13:22:53 +02:00
Toke Stuart Jepsen
441618974e All review publish attributes should be copied to model instance 2023-07-22 10:19:47 +01:00
Toke Stuart Jepsen
70f97b2738 Fix get_pre_create_attr_defs query 2023-07-22 09:24:21 +01:00
Toke Stuart Jepsen
484108cb81 Fix MayaHiddenCreator 2023-07-21 14:59:56 +01:00
Toke Stuart Jepsen
f91189fdf3 Use MayaHiddenCreator 2023-07-21 12:18:16 +01:00
Toke Stuart Jepsen
3b23bf9f1f Merge branch 'develop' into bugfix/maya_include_disabled_plugins 2023-07-21 11:28:40 +01:00
Milan Kolar
7ee43eef70
Merge pull request #5335 from tokejepsen/bugfix/maya_validate_instance_in_context 2023-07-21 12:25:11 +02:00
Toke Stuart Jepsen
67cd2ff650 Fix fetching top level parents 2023-07-21 11:07:04 +01:00
Toke Stuart Jepsen
a79eca9980 Add new publisher error raising 2023-07-21 11:00:04 +01:00
Jakub Trllo
464e621880 implemented base classes of auto creator and hidden creator for maya 2023-07-20 15:53:00 +02:00
Jakub Trllo
8c73d22d27 extracted common logic to 'MayaCreatorBase' 2023-07-20 15:51:12 +02:00
Toke Stuart Jepsen
0d0681f621 Hardcode enabled state 2023-07-17 15:45:17 +01:00
clement.hector
363af956d4 replace endswith by startswith in rig outputs id
need this one for publish multiple rig in one asset.
2023-07-17 15:56:01 +02:00
Petr Kalis
b90d1c9e65 Fix wrong merge 2023-07-17 13:22:04 +02:00
Petr Kalis
7939836e65
Merge branch 'develop' into maye_new_publisher_with_RR 2023-07-17 11:08:55 +02:00
Toke Stuart Jepsen
16a9e707d8 Apply project settings to creators 2023-07-14 11:34:42 +01:00
Toke Stuart Jepsen
97d8f89e44 Code cosmetics 2023-07-14 11:17:37 +01:00
Toke Stuart Jepsen
167fd7186c Hide CreateAnimation instead of disable 2023-07-14 11:15:18 +01:00
Milan Kolar
6e64b7275f
Merge pull request #5258 from BigRoy/refactor/maya_lib_get_reference_node 2023-07-14 09:50:50 +02:00
Toke Stuart Jepsen
c10ad8227a Code cosmetics 2023-07-13 18:11:40 +01:00
Toke Stuart Jepsen
d41f10e6f7 Fix converting 2023-07-13 18:10:42 +01:00
Toke Stuart Jepsen
3f10968c95 Change solution for loading rig 2023-07-13 18:06:35 +01:00
Toke Jepsen
04af219c61
Update openpype/hosts/maya/plugins/create/convert_legacy.py
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2023-07-13 17:12:47 +01:00
Toke Stuart Jepsen
8d9a283a09 Include disabled plugins 2023-07-13 16:41:22 +01:00
Milan Kolar
c3e20024bf Copy publish attributes from review instance to any attached instances 2023-07-13 15:55:39 +02:00
Jakub Trllo
c360d0b28d AYON: General fixes and updates (#4975)
* fix color conversion of maya load colors

* this seems to have been accidentally switched before, if there are no versions, return nothing, if there are, return something

* maya failed to run the userSetup due to the variable having been changed to settings

* fix representation fields conversion

* fix missing legacy io

* fix tools env conversion

* Updated AYON python api

---------

Co-authored-by: Sveinbjorn J. Tryggvason <sveinbjorn@rvx.is>
2023-07-11 18:13:48 +02:00
Jakub Trllo
c10781a662 General: Reduce usage of legacy io (#4723)
* 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>
2023-07-11 18:11:07 +02:00