Commit graph

822 commits

Author SHA1 Message Date
Roy Nieterau
e79f1ef4b9 Replacing value only if value is in str is same as just replacing it 2023-09-06 23:30:17 +02:00
Roy Nieterau
ba6dfc5ead Remove unused variables + tweak logs 2023-09-06 23:28:39 +02:00
Jakub Trllo
cb3e83118b maya create plugins do not expecte system settings 2023-09-01 17:14:39 +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
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
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
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 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
3b23bf9f1f Merge branch 'develop' into bugfix/maya_include_disabled_plugins 2023-07-21 11:28:40 +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
16a9e707d8 Apply project settings to creators 2023-07-14 11:34:42 +01:00
Toke Stuart Jepsen
167fd7186c Hide CreateAnimation instead of disable 2023-07-14 11:15:18 +01:00
Toke Stuart Jepsen
3f10968c95 Change solution for loading rig 2023-07-13 18:06:35 +01: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
Roy Nieterau
f58994d59c Loader: Remove context argument from Loader.__init__() (#4602)
* Remove Loader `context` argument to __init__

* Add backwards compatibility for Loader.load by still setting `.fname` attr

* Refactor/remove usage of `self.fname` in loaders

* Fix some refactoring

* Fix some refactoring

* Hound

* Revert invalid refactor

* Fix refactor

* Fix playblast panel collection

* Refactor missing method

* Fix typo

* Use the correct `context`

---------

Co-authored-by: Toke Stuart Jepsen <tokejepsen@gmail.com>
Co-authored-by: Kayla Man <64118225+moonyuet@users.noreply.github.com>
Co-authored-by: Jakub Trllo <jakub.trllo@gmail.com>
2023-07-11 17:48:33 +02:00
Ondrej Samohel
92d18eb970
🔀 Merge remote-tracking branch 'origin/develop' into maya_new_publisher 2023-07-11 15:58:18 +02:00
Toke Stuart Jepsen
4d87046f6a Fix set_attribute for enum attributes 2023-07-06 16:42:05 +01:00
Milan Kolar
b538efdcdd
Merge pull request #5243 from tokejepsen/bugfix/maya_arnold_prefix_none 2023-07-06 12:01:54 +02:00
Roy Nieterau
2b23b42da6
RepairAction and SelectInvalidAction actually filter to instances that failed on the exact plugin - not on "any failure" (#5240) 2023-07-05 14:11:20 +02:00
Toke Stuart Jepsen
558cd4fe68 Use BigRoy soluiton 2023-07-05 12:42:16 +01:00
Toke Stuart Jepsen
974d708693 Revert "Fix collecting arnold prefix when none"
This reverts commit ba877956b9.
2023-07-05 12:41:26 +01:00
Milan Kolar
d6d2c4f125
Merge pull request #5226 from BigRoy/chore/maya_minor_refactor 2023-07-05 11:48:15 +02:00
Toke Stuart Jepsen
ba877956b9 Fix collecting arnold prefix when none 2023-07-05 09:17:53 +01:00
Jakub Ježek
04babc069c
Merge pull request #5225 from BigRoy/enhancement/maya_no_save_file_prompt_after_new_file 2023-07-04 16:05:14 +03:00
Milan Kolar
a8574255b3
Merge pull request #5222 from quadproduction/488-bug-template-builder-fails-when-loading-data-without-outliner-representation 2023-07-04 09:53:17 +02:00
Roy Nieterau
d88735bc1e Remove unused comment 2023-06-30 23:27:20 +02:00
Roy Nieterau
c14255da22 Remove unused import 2023-06-30 23:21:33 +02:00
Roy Nieterau
9fc5b5fd00 Remove unused empty file 2023-06-30 23:20:41 +02:00
Roy Nieterau
ad161379df Remove unused import 2023-06-30 23:18:25 +02:00
Roy Nieterau
fcde6ecb29 Only apply UI related tweaks when not in headless mode 2023-06-30 23:05:50 +02:00
Roy Nieterau
6c07372f78 Use get_main_window logic from lib 2023-06-30 23:01:29 +02:00
Roy Nieterau
843cbb2387 Minor optimization to look only for exact type matches 2023-06-30 22:56:13 +02:00
Roy Nieterau
667e8373b9 Cleanup fix_incompatile_containers
- Do not just print all loader names always :)
- Define invalid names ones
- Use a set for faster lookups
- Log some decent info message whenever it does trigger on legacy scene
2023-06-30 22:55:47 +02:00
Roy Nieterau
bc15989b2e Cleanup: Remove old commented code 2023-06-30 22:54:26 +02:00
Roy Nieterau
0b6f9dc8f2 Apply deferred renderlayer observer changes all at once (1x deferred) and use maya.utils.executeDeferred 2023-06-30 22:53:21 +02:00
Roy Nieterau
a2ef4e0013 Restructure set_colorspace
- Only set `configFilePath` when OCIO env var is not set since it doesn't do anything if OCIO var is set anyway.
- Set the Maya 2022+ default OCIO path using the resources path instead of "" to avoid Maya Save File on new file after launch (this also fixes the Save prompt on open last workfile feature with Global color management enabled)
- Move all code related to applying the maya settings together after querying the settings
- Swap around the `if use_workfile_settings` since the check was reversed
- Use `get_current_project_name()` instead of environment vars
2023-06-30 22:05:45 +02:00
Toke Stuart Jepsen
aaf3a9acfe Hound 2023-06-30 15:53:34 +01:00
Toke Stuart Jepsen
8713759c18 Hound 2023-06-30 15:53:08 +01:00
Toke Stuart Jepsen
e7bdf25b9a HOund 2023-06-30 15:41:39 +01:00
Toke Stuart Jepsen
8e9f4eb40e Log message about overwrites and continue 2023-06-30 15:40:31 +01:00
Ondrej Samohel
2e1b0faa7c
🐛 fix light enum values 2023-06-30 16:17:48 +02:00
clement.hector
13820bf99b indent correction 2023-06-30 15:15:06 +02:00
clement.hector
0033efe5b1 catch assertion error 2023-06-30 15:08:38 +02:00
Ondrej Samohel
4b12f49dd6
🔀 Merge remote-tracking branch 'origin/develop' into maya_new_publisher 2023-06-30 14:24:33 +02:00
Toke Stuart Jepsen
ab57a4c8a5 Merge branch 'enhancement/OP-6222_xgen-sidecar-files' of https://github.com/tokejepsen/pype into enhancement/OP-6222_xgen-sidecar-files
# Conflicts:
#	openpype/hosts/maya/api/pipeline.py
2023-06-30 08:17:27 +01:00