Commit graph

2092 commits

Author SHA1 Message Date
Roy Nieterau
1597306f45 Remove legacy integrator (#4786) 2023-07-11 18:11:07 +02:00
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
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
Ondrej Samohel
92d18eb970
🔀 Merge remote-tracking branch 'origin/develop' into maya_new_publisher 2023-07-11 15:58:18 +02:00
Roy Nieterau
19570ec2ea Fix defaults 2023-07-06 14:43:23 +02:00
Milan Kolar
6280dd1e16
Merge pull request #5001 from ynput/feature/OP-5871_Max-Review-feature 2023-07-05 10:15:41 +02:00
Jakub Jezek
744095eb16
maya: allign default settings to distributed aces 1.2 config 2023-07-03 16:39:40 +02:00
Kayla Man
0afd9aa97e resolve conflict 2023-06-30 21:09:41 +08:00
Ondrej Samohel
4b12f49dd6
🔀 Merge remote-tracking branch 'origin/develop' into maya_new_publisher 2023-06-30 14:24:33 +02:00
Petr Kalis
b9115502f9
OP-6272 - add container check validator to AE settings (#5203) 2023-06-28 11:11:34 +02:00
Petr Kalis
84fe7e7c7b Revert backward incompatible change of path to template to multiplatform
It requires to use `work[root]` to handle multiplatformity.
In the case of customer request it needs to be reworked for proper multiplatformity.
2023-06-27 15:50:08 +02:00
Petr Kalis
83242487fd
AfterEffects: support for workfile template builder (#5163)
* OP-5661 - added new menu item to AE extension

* OP-5661 - added support for addPlaceholder into extension

* OP-5661 - fix broken abstract loader

In some cases discover couldn't recognize that base plugin is abstract. Handled properly

* OP-5661 - WIP of implementing workfile template builder

* OP-5661 - added route to add placeholder

* OP-5661 - added route to build workfile

* OP-5661 - refactored arguments

* OP-5661 - implemented build workfile operation

moved from wrong position

* OP-5661 - removed wrong base plugin

* OP-5661 - implemented update placeholder logic

* OP-5661 - fix update placeholder metadata

* OP-5661 - added Creator placeholder plugin

* OP-5661 - pre_create_data could be passed into Creator

This allow to modify `pre_create_data` before automatically creating an instance. (Useful for overridding defaults.)

* OP-5661 - implemented populate of Create placeholder

* OP-5661 - implemented import of template

* OP-5661 - fix to populate correct create placeholder

Implemented function to select item(s) by their id. (CreateRender expects selected composition.)

* OP-5661 - fix workfile builder schema to multiplatform path

Path should be separated by platform.

* OP-5661 - implemented adding loaded items instead of placeholders

* OP-5661 - add Create Placeholder plugin to dropdown

* OP-5661 - add templated workfile to Settings

* OP-5661 - fix to choose template file from multiplatform

* OP-5661 - added documentation
2023-06-27 10:58:55 +02:00
Ondřej Samohel
d3b2102f52
Merge branch 'develop' into maya_new_publisher 2023-06-23 15:33:30 +02:00
Kayla Man
a0947de6cf Merge branch 'develop' into feature/OP-5871_Max-Review-feature 2023-06-19 14:30:34 +08:00
Ondrej Samohel
8c848f6e55
Merge remote-tracking branch 'origin/develop' into maya_new_publisher 2023-06-16 16:29:54 +02:00
Jakub Trllo
3d41ee6591
TrayPublisher & StandalonePublisher: Specify version (#5142)
* modified simple creator plugin to be able handle version control

* added 'allow_version_control' to simple creators

* don't remove 'create_context' from pyblish context during publishing

* implemented validator for existing version override

* actually fill version on collected instances

* version can be again changed from standalone publisher

* added comment to collector

* make sure the version is set always to int

* removed unused import

* disable validator if is disabled

* fix filtered instances loop
2023-06-16 16:26:04 +02:00
Jakub Trllo
6087b27c32
Ftrack: Task status during publishing (#5123)
* ftrack status is not set in deadline plugin during celaction integration

* implemented new logic to set task status during publishing

* added missing settings for new plugins

* integrate hierarchy ftrack is filling status names for newly created tasks

* resaved default settings

* change label in settings

* Remove leftover docstring

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

* Use smaller differentiation in order to keep plugin in integration range

* formatting changes

---------

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2023-06-15 16:05:59 +02:00
Jakub Ježek
caee9dcb13
Merge branch 'develop' into feature/OP-5207_Global-host-color-management-activation 2023-06-09 14:24:21 +02:00
Ondřej Samohel
869cb5ef15
Merge branch 'develop' into feature/OP-5207_Global-host-color-management-activation 2023-06-09 14:02:25 +02:00
Kayla Man
e295b19149 Merge branch 'develop' into feature/OP-5871_Max-Review-feature 2023-06-08 17:29:44 +08:00
Jakub Ježek
da750e3772
Merge branch 'develop' into bugfix/OP-5944_nuke_few_fixes 2023-06-07 11:55:25 +02:00
Jakub Jezek
bb56d5dc16
fixing nuke settings default 2023-06-06 16:49:48 +02:00
Milan Kolar
c3cfe1f4ce Merge branch 'develop' into maya_new_publisher 2023-06-02 18:40:41 +02:00
Kayla Man
7075d5c445 add some comment 2023-06-02 17:18:13 +08:00
Kayla Man
27ae0d9f20 refactor custom write node script 2023-06-02 17:11:16 +08:00
Jakub Ježek
99f239fa8f
Merge branch 'develop' into enhancement/OP-6020_Nuke-custom-setFrameRange-script 2023-06-01 21:35:46 +02:00
Kayla Man
6de4ceabd3 custom settings for write node without publish and register 2023-06-01 23:13:34 +08:00
Jakub Ježek
4cd2291bf6
Merge branch 'develop' into feature/resolve_open_last_workfile 2023-06-01 16:56:05 +02:00
Jakub Jezek
abc266e9e5
refactor the script to be frame number rather then frame range 2023-06-01 16:14:29 +02:00
Kayla Man
021ea8d638 update the command 2023-06-01 00:30:19 +08:00
Kayla Man
a30ba51508 use nukescript's panel 2023-06-01 00:11:30 +08:00
Jakub Jezek
ee41b877e6
refactor file rules logic to separate host activation
This is implementing logic introduced here https://github.com/ynput/OpenPype/pull/4700#discussion_r1193612003
2023-05-31 16:10:17 +02:00
Jakub Ježek
ec7b85b501
Merge branch 'develop' into feature/OP-5207_Global-host-color-management-activation 2023-05-31 15:41:02 +02:00
Kayla Man
4c91de812e Merge branch 'develop' into enhancement/OP-6020_Nuke-custom-setFrameRange-script 2023-05-31 20:17:29 +08:00
Kayla Man
183b2866d9 style fix 2023-05-31 20:14:57 +08:00
Kayla Man
11728bae0e roy's comment and uses import instead of from..import 2023-05-31 20:02:05 +08:00
Simone Barbieri
e22d1bf78b Set dev mode off by default 2023-05-31 10:45:47 +01:00
Kayla Man
debd40b119 Merge branch 'develop' into enhancement/OP-6020_Nuke-custom-setFrameRange-script 2023-05-31 16:49:02 +08:00
Jakub Ježek
8197b11c3e
Merge branch 'develop' into enhancement/OP-6045_Disable-Collect-Frames-to-Fix-from-settings 2023-05-30 16:53:31 +02:00
Kayla Man
2e58cd2e1a move the custom popup menu to nuke/startup and add the frame setting to Openpype tool menu 2023-05-30 21:44:26 +08:00
Roy Nieterau
739c6a1cc9 Merge remote-tracking branch 'upstream/develop' into maya_new_publisher
# Conflicts:
#	openpype/hosts/maya/plugins/publish/validate_instance_has_members.py
2023-05-30 15:14:17 +02:00
Roy Nieterau
307eca8c28 Cleanup Resolve startup script + add setting for launch menu on start 2023-05-30 13:24:17 +02:00
Milan Kolar
3e316dd495
Merge pull request #4987 from ynput/enhancement/OP-5918_blender-add_base_file_unit_scale_in_settings 2023-05-29 23:33:00 +02:00
Jakub Trllo
9e9a9bd5e6 Merge branch 'develop' into maya_new_publisher
# Conflicts:
#	openpype/hosts/maya/api/lib.py
#	openpype/plugins/publish/collect_scene_version.py
2023-05-26 12:36:03 +02:00
Kayla Man
17040ba519 Merge branch 'develop' into feature/OP-5871_Max-Review-feature 2023-05-26 13:00:22 +08:00
Jakub Jezek
31da5582fc
make understandable label in settings 2023-05-25 21:39:07 +02:00
Jakub Jezek
b47143b472
collect frames to fix settings 2023-05-25 17:41:36 +02:00
Jakub Jezek
e6b301fecb
defaults update 2023-05-24 16:45:43 +02:00
Jakub Jezek
c2055622ab
adding remapping functionality 2023-05-24 15:51:29 +02:00