Commit graph

31966 commits

Author SHA1 Message Date
Petr Kalis
e42aebc1f2 Global: custom location for OP local versions (#4673)
* OP-5221 - updated settings for custom location of artist zip folder

* OP-5221 - updated igniter for custom location of artist zip folder

Introduced new function
Updated data_dir only after access to Mongo (DB)

* OP-5221 - pushed resolving of local folder to OpenPypeVersion

Logic in OpenPypeVersion is used even in openpype_version.py

* OP-5221 - updates after review

* OP-5221 - fix paths should be single paths

* OP-5221 - refactor to cls

* OP-5221 - refactor

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

* OP-5221 - fix defaults for single paths

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

* OP-5221 - remove unwanted line

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

* OP-5221 - update look of Settings

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-07-11 17:50:51 +02:00
Jakub Trllo
66c4522f9c update pyside6 to 6.4.3 (#4764) 2023-07-11 17:50:51 +02:00
Jakub Trllo
db6222fd0d vendorize ayon api (#4753) 2023-07-11 17:50:51 +02:00
Jakub Trllo
e9b1713975 change 'token_changed' (#4754) 2023-07-11 17:50:51 +02:00
Jakub Trllo
47473a8a23 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>
2023-07-11 17:50:50 +02:00
Jakub Trllo
33148f45e7 General: Environment variable for default OCIO configs (#4670)
* set 'BUILTIN_OCIO_ROOT' environment variable in start.py

We need to use simplified variant to fill default ocio root for OCIO configs to replace '{OPENPYPE_ROOT}/vendor/bin/ocioconfig/OpenColorIOConfigs' in settings.

The explicit path from OPENPYPE_ROOT disable option to change the path elsewhere without harm of settings change. Using 'BUILTIN_OCIO_ROOT' can be usd universally.

* use new env variable in OCIO settings
2023-07-11 17:48:33 +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
2fdb0ece6b 📝 add documentation about building documentation 2023-07-11 17:48:32 +02:00
Ondrej Samohel
74e4b3d4f2 🐛 make autoapi mandatory 2023-07-11 17:48:32 +02:00
Ondrej Samohel
fd75d7c13f 🐛 fix markdown parsing 2023-07-11 17:48:32 +02:00
Ondrej Samohel
9d8ebf5091 ♻️ theme switch 2023-07-11 17:48:31 +02:00
Ondrej Samohel
5506f52f25 🎨 change docs theme 2023-07-11 17:48:31 +02:00
Ondrej Samohel
39c142655f 🎨 templates and fixes 2023-07-11 17:48:31 +02:00
Ondrej Samohel
2951b2690e 🚧 docs reborn 2023-07-11 17:48:31 +02:00
Jakub Trllo
e42918997e fix possible issues with destination drive path 2023-07-11 17:48:30 +02:00
Ondrej Samohel
7992ba6969 🐛 fix error reports in silent mode 2023-07-11 17:48:30 +02:00
Ondřej Samohel
0b8207a5f2
Merge pull request #4388 from BigRoy/maya_new_publisher 2023-07-11 17:41:06 +02:00
Ondřej Samohel
a17297782d
Merge branch 'develop' into maya_new_publisher 2023-07-11 15:58:53 +02:00
Ondrej Samohel
92d18eb970
🔀 Merge remote-tracking branch 'origin/develop' into maya_new_publisher 2023-07-11 15:58:18 +02:00
Jakub Ježek
ab56b9acbc
Merge pull request #5271 from ynput/enhancement/OP-4770_updating_testing_args
Testing: improving logging during testing
2023-07-11 16:56:51 +03:00
Ondřej Samohel
197067d6e7
Update openpype/hosts/maya/plugins/publish/collect_review.py
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2023-07-11 15:48:01 +02:00
Jakub Ježek
2175874686
Merge pull request #5267 from ynput/bugfix/OP-5596_Nuke-Publisher-failing-due-utf8-0xc0
Nuke: fixing container data if windows path in value
2023-07-11 12:30:41 +03:00
Milan Kolar
9ed2a7743b
Merge pull request #5259 from BigRoy/bugfix/substance_painter_global_ocio_enabled 2023-07-11 08:39:53 +02:00
github-actions[bot]
33e7db5754 chore(): update bug report / version 2023-07-10 15:28:15 +00:00
ynbot
a7be0e7150
[Automated] Merged release main into develop 2023-07-10 17:27:43 +02:00
Ynbot
297f53f329 [Automated] Release 2023-07-10 15:27:11 +00:00
ynbot
0d7201f001
[Automated] Merged develop into main 2023-07-10 17:26:53 +02:00
Jakub Jezek
5ebdedde6a
improving logging during testing 2023-07-10 16:51:22 +02:00
Ondřej Samohel
d43a56ef62
Merge pull request #5257 from BigRoy/bugfix/maya_look_update_nodes_by_id 2023-07-10 13:31:29 +02:00
Simone Barbieri
7a164491f2
Merge pull request #5268 from tokejepsen/bugfix/unreal_no_qt_imports 2023-07-10 10:57:44 +01:00
Toke Stuart Jepsen
252e1f0307 Move Qt imports away from module init 2023-07-10 10:01:38 +01:00
Jakub Jezek
7e871d83ae
fixing openpype container data if windows path 2023-07-10 10:43:27 +02:00
Milan Kolar
7ed6119473
Merge pull request #5250 from ynput/enhancement/houdini_pointcache_creation 2023-07-10 08:05:04 +02:00
github-actions[bot]
680ea6d0d7 chore(): update bug report / version 2023-07-08 03:32:33 +00:00
ynbot
02dce23f38
[Automated] Merged main into develop 2023-07-08 05:32:02 +02:00
Ynbot
0611163c1f [Automated] Bump version 2023-07-08 03:31:49 +00:00
ynbot
d46ecd84f1
[Automated] Merged develop into main 2023-07-08 05:30:38 +02:00
Milan Kolar
57bc75f2bd
Merge pull request #5051 from Zipodod/bugfix/napi_use_inpanel 2023-07-07 15:11:35 +02:00
Roy Nieterau
ed91fdde03
Update scene inventory even if any errors occurred during update (#5252)
* Update scene inventory even if any errors occurred during update + re-use logic

* Fix code
2023-07-07 13:51:35 +02:00
Alexey Bogomolov
99efc0e735
rstrip the template string (#5235) 2023-07-07 13:38:35 +02:00
Milan Kolar
789f2105e1
Merge pull request #5261 from tokejepsen/bugfix/maya_set_enum_attributes 2023-07-07 09:12:11 +02:00
Toke Stuart Jepsen
4d87046f6a Fix set_attribute for enum attributes 2023-07-06 16:42:05 +01:00
Mustafa-Zarkash
6b1707d51f make it less restrictive 2023-07-06 17:37:21 +03:00
Roy Nieterau
19570ec2ea Fix defaults 2023-07-06 14:43:23 +02:00
Roy Nieterau
a2b1de806a Align import style 2023-07-06 13:58:51 +02:00
Roy Nieterau
01c8b6b469 Improve readability 2023-07-06 13:58:38 +02:00
Roy Nieterau
c0a9536f52 Ensure fullpath (=bugfix) + query relatives once + avoid duplicates 2023-07-06 13:58:19 +02:00
Mustafa-Zarkash
d58ef791f8 make hound happy 2023-07-06 13:47:52 +03:00
Mustafa-Zarkash
44571c1f06 delete unnecessary function call 2023-07-06 13:42:50 +03:00
Mustafa-Zarkash
ac517edf55 resolve conversation 2023-07-06 13:35:13 +03:00