Commit graph

86 commits

Author SHA1 Message Date
Roy Nieterau
5d10f7f2dd
Remove global RENDER_ATTRS, refactor to a RenderSettings.get_padding_attr method (#5801)
- Partial cleanup extracted from #3880
2023-11-15 13:15:50 +01:00
Toke Jepsen
f7d76617c0
Testing: Validate Maya Logs (#5775)
* Working version

* Improve launched app communication

* Move imports to methods.

* Update tests/integration/hosts/maya/test_publish_in_maya.py

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

* Collect errors from process

* fix startup scripts arguments

* Update openpype/lib/applications.py

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

* Fix application polling

* Docstring

* Revert stdout and stderr

* Revert subprocess.PIPE

* Added missed imports

If we are moving these because of testing, lets move all of them

---------

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Co-authored-by: kalisp <petr.kalis@gmail.com>
2023-11-07 16:51:54 +01:00
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
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
c3becbffe0 Fix #4429: Do not reset fps or playback timeline on applying or creating render settings 2023-03-11 19:42:14 +01:00
Roy Nieterau
173ec225eb Set image format 2023-03-03 10:32:05 +01:00
Toke Stuart Jepsen
125b10df5f Merge branch 'develop' into enchancement/OP-2630_acescg_maya
# Conflicts:
#	openpype/hosts/maya/api/lib_renderproducts.py
2023-02-22 06:47:18 +00:00
Petr Kalis
72134d4a21 Fix changed location of reset_frame_range
Location in commands caused cyclic import
2023-02-20 18:33:15 +01:00
Toke Stuart Jepsen
89d7edd8df Support for Maya Hardware 2023-02-01 12:06:26 +00:00
Ondřej Samohel
dd4f5a2d19
Merge pull request #4003 from ynput/OP-3572/Renderman-support-for-Sample-and-Display 2023-01-27 16:20:59 +01:00
Kayla Man
771d7994dc update the redshift render settings 2022-12-12 22:05:47 +08:00
Kayla Man
dbe5872960 options for creating renderpasses in redshift and vray 2022-12-07 23:43:23 +08:00
Kayla Man
b6b7ac2922 adding options for creating renderpasses in redshift and vray 2022-12-07 16:55:47 +08:00
Kayla Man
8ad8aa9e52 add the correct image prefix format for Renderman 2022-11-29 18:50:16 +08:00
Kayla Man
7dc9734a1e add the correct image prefix format for Renderman 2022-11-29 18:49:18 +08:00
Kayla Man
7e65eb2401 set the correct path for filters, image ouptut and image directory 2022-11-29 15:44:01 +08:00
Kayla Man
f63c28fd5b set the correct path for filters, image ouptut and image directory 2022-11-29 15:42:40 +08:00
Kayla Man
8b5a7c4061 set the correct path for filters, image ouptut and image directory 2022-11-29 15:40:56 +08:00
Kayla Man
6e3c75f0f0 set the correct path for filters, image ouptut and image directory 2022-11-29 15:38:11 +08:00
Kayla Man
474958f7fa set the correct path for filters, image ouptut and image directory 2022-11-29 15:35:28 +08:00
Kayla Man
9c024776b0 Merge branch 'develop' into OP-3572/Renderman-support-for-Sample-and-Display 2022-11-24 16:07:22 +08:00
Kayla Man
1b00dec8de adding removeAOVs in setting to allow users to choose whether keeping existing AOVs 2022-11-15 03:08:08 +08:00
Kayla Man
6190e6ba11 adding removeAOVs in setting to allow users to choose whether keeping existing AOVs 2022-11-15 03:07:22 +08:00
Kayla Man
6f65ea4f54 adding removeAOVs in setting to allow users to choose whether keeping existing AOVs 2022-11-15 02:39:31 +08:00
Kayla Man
2e2386a349 adding removeAOVs in setting to allow users to choose whether keeping the aovs 2022-11-14 22:47:33 +08:00
Kayla Man
85d8edcd00 adding removeAOVs in setting to allow users to choose whether keeping existing AOVs 2022-11-14 21:25:51 +08:00
Kayla Man
b17eb8df7d adding removeAOVs in setting to allow users to choose whether keeping existing AOVs 2022-11-14 21:24:57 +08:00
Kayla Man
6a1846a36b adding removeAOVs in setting to allow users to choose whether keeping existing AOVs 2022-11-14 21:10:29 +08:00
Kayla Man
7938f843f0 adding removeAOVs in setting to allow users to choose whether keeping existing AOVs 2022-11-10 20:52:40 +08:00
Kayla Man
c3c7288803 Renderman support for sample and deisplay filter 2022-11-08 14:36:17 +08:00
Kayla Man
81e3157616 Renderman support for sample and deisplay filter 2022-11-08 14:35:19 +08:00
Kayla Man
59cab53c68 Renderman support for sample and deisplay filter 2022-11-08 14:33:50 +08:00
Kayla Man
7885a7b10c Renderman support for sample and deisplay filter 2022-11-08 14:32:35 +08:00
Kayla Man
d3f0ab4754 Renderman support for sample and deisplay filter 2022-11-08 14:31:24 +08:00
Kayla Man
8dc7a17a79 Renderman support for sample and deisplay filter 2022-11-08 14:30:11 +08:00
Kayla Man
64668576c4 renderman 2022-11-08 14:29:07 +08:00
Kayla Man
7cf4578d41 renderman-support-for-sample-and-display 2022-11-08 14:22:36 +08:00
Kayla Man
769763c475 Renderman setup for sample and display filters 2022-10-26 20:00:22 +08:00
Kayla Man
bf5213a780 Renderman setup for sample and display filters 2022-10-19 22:34:35 +08:00
Kayla Man
28dfc7b9f6 Renderman setup for sample and display filters 2022-10-19 22:33:17 +08:00
Kayla Man
62a6f4c4ad Renderman setup for sample and display filters 2022-10-19 22:24:28 +08:00
Ondřej Samohel
d3347e4781
Merge branch 'develop' into maya_renders_remove_hardcoded_maya_folder 2022-10-13 12:39:32 +02:00
Jakub Trllo
35645690cf one more settings import change 2022-10-04 12:20:36 +02:00
Roy Nieterau
24270a5893 Merge remote-tracking branch 'upstream/develop' into maya_renders_remove_hardcoded_maya_folder 2022-09-29 16:43:45 +02:00
Roy Nieterau
83922a87cd Add double attribute support (float) 2022-09-17 13:19:37 +02:00
Roy Nieterau
0c71ec1d38 Tweak readability, log error on unsupported attribute type 2022-09-17 13:18:04 +02:00
Roy Nieterau
2c8eaec2d7 Remove debug print statement 2022-09-17 11:04:12 +02:00
Roy Nieterau
ad4211656b Remove double setting of additional attributes for Arnold 2022-09-17 10:52:36 +02:00
Roy Nieterau
59cfca7508 Do not enforce maya/ folder 2022-09-16 14:44:19 +02:00
Roy Nieterau
3d62093224 Refactor moved usage of CreateRender settings 2022-08-10 16:14:50 +02:00