Commit graph

133 commits

Author SHA1 Message Date
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
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
Toke Stuart Jepsen
077af17672 Merge branch 'develop' into enhancement/maya_template
# Conflicts:
#	openpype/hosts/maya/api/workfile_template_builder.py
2023-06-27 10:46:29 +01: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
Toke Jepsen
dcf3b27493
Update openpype/pipeline/workfile/workfile_template_builder.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-06-23 14:49:46 +01:00
Roy Nieterau
c940b82fb9 Merge branch 'develop' of https://github.com/pypeclub/OpenPype into enhancement/maya_template
# Conflicts:
#	openpype/hosts/maya/api/lib.py
2023-06-12 15:46:13 +02:00
Thomas Fricard
55040e6f74
Drop-down menu to list all families in create placeholder (#4928)
* convert family text field to enum field

* get families from loaders and not creators

* refactor the list families part

* remove discover_loader_plugins call since there is already a variable with loaders plugins

---------

Co-authored-by: Thomas Fricard <tfricard@ws114.prs.vfx.int>
Co-authored-by: Clément Hector <clement.hector@gmail.com>
2023-05-25 10:32:36 +02:00
kaa
d3428da393
fix get_linked_assets project name arg (#4940) 2023-05-12 15:19:23 +02:00
Toke Stuart Jepsen
d2842b0cd7 post_representation_load > post_placeholder_process 2023-05-11 17:55:25 +01:00
Toke Stuart Jepsen
9747398ce8 Rename "cleanup_placeholder" to "post_representation_load" 2023-04-28 15:25:37 +01:00
Toke Stuart Jepsen
fa73bbb568 Account for "create_first_version" setting. 2023-04-26 11:26:35 +01:00
Toke Stuart Jepsen
f4117a7a5c Clean up of placeholder. 2023-04-26 10:35:40 +01:00
Roy Nieterau
b05afaa837
Global: Optimize anatomy formatting by only formatting used templates instead (#4784)
* TemplatesDict can create different type of template

* anatomy templates can be formatted on their own

* return objected templates on get item

* '_rootless_path' is public classmethod 'rootless_path_from_result'

* 'AnatomyStringTemplate' expect anatomy templates

* remove key getters

* fix typo 'create_ojected_templates' -> 'create_objected_templates'

* Fix type of argument

* Fix long line

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Use format strict + code cosmetics

* Get template from the formatted data

* Update openpype/plugins/publish/integrate_legacy.py

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

* Cosmetics

* Move template obj definition for path up + rename to `path_template_obj`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

---------

Co-authored-by: Jakub Trllo <jakub.trllo@gmail.com>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-04-17 14:53:15 +02:00
clement.hector
9be576c214 fix linked asset import 2023-04-05 15:40:09 +02:00
Jakub Jezek
af39368838
hound 2023-03-06 17:07:56 +01:00
Jakub Jezek
b2eb14914b
global, nuke: adding support for first workfile creation 2023-03-06 16:55:05 +01:00
Jakub Jezek
0993fa447d
Merge branch 'bugfix/OP-5037_Global-workfile-template-builder-Creators-failing' into feature/OP-4778_Nuke-create-first-workfile-template-switch-to-preset 2023-03-06 12:08:25 +01:00
Jakub Jezek
2e83019efa
hound 2023-03-01 17:31:45 +01:00
Jakub Jezek
e1fa9f7c31
adding noqa for hound 2023-03-01 17:30:31 +01:00
Jakub Jezek
491eb3e750
create first workfile version function to global abstraction 2023-03-01 17:27:16 +01:00
Jakub Jezek
698e639fa6
Merge branch 'bugfix/OP-5037_Global-workfile-template-builder-Creators-failing' into feature/OP-4778_Nuke-create-first-workfile-template-switch-to-preset 2023-03-01 10:31:11 +01:00
Jakub Jezek
7c90b6616d
adding headless to creators and workfile builder abstraction 2023-02-28 17:32:49 +01:00
Jakub Trllo
9acf634d13 fix attribute access 2023-02-28 17:09:43 +01:00
Jakub Trllo
6b2c10da04 use 'create' method on create context to trigger creation 2023-02-28 16:51:18 +01:00
Jakub Trllo
b7e99dacb8 fix spaces 2023-02-28 15:45:12 +01:00
Jakub Trllo
1ef786afb8 added option to use new creating system in workfile template builder 2023-02-28 14:39:12 +01:00
Jakub Jezek
2ed1a97864
nuke: start new workfile from tempate wip 2023-02-28 14:22:38 +01:00
Jakub Jezek
8a6efcd6ef
Nuke: new version builder from tempate wip 2023-02-28 10:00:25 +01:00
Jakub Trllo
5d9e7cf52d fix formatting 2023-01-27 17:21:28 +01:00
Jakub Trllo
d48b73ed61 fix typo 'AbtractAttrDef' to 'AbstractAttrDef' 2023-01-27 16:28:00 +01:00
Jakub Trllo
42dccc0f8c
Merge pull request #4295 from ynput/feature/enhanced_enum_def
General: Enhanced enum def items
2023-01-17 13:57:11 +01:00
iLLiCiTiT
72ff721bd2 skip disabled loaders 2023-01-12 11:41:03 +01:00
iLLiCiTiT
7d01590b64 creators can be disabled too 2023-01-12 11:38:30 +01:00
Jakub Trllo
15fd19337a fix usages of 'EnumDef' in codebase 2023-01-09 15:16:45 +01:00
Jakub Jezek
c071140a6f
PR comments 2023-01-06 10:54:06 +01:00
Jakub Ježek
d6004c2646
Update openpype/pipeline/workfile/workfile_template_builder.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-01-06 10:39:43 +01:00
Jakub Ježek
673e7a7359
Update openpype/pipeline/workfile/workfile_template_builder.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-01-06 10:38:36 +01:00
Jakub Jezek
20b2b50bac
global: adding project anatomy data for formating 2023-01-06 10:35:54 +01:00
Jakub Ježek
e69f3539ea
Update openpype/pipeline/workfile/workfile_template_builder.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-01-04 14:26:26 +01:00
Jakub Ježek
40cf2956fd
Update openpype/pipeline/workfile/workfile_template_builder.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-01-04 14:26:15 +01:00
Jakub Jezek
4f7e4fcac3
global: add _before_instance_create function for storing created nodes 2022-12-23 14:26:28 +01:00
Jakub Jezek
81de2cf0c9
global: fix _repr_ pformat printing 2022-12-23 14:25:41 +01:00
Jakub Jezek
c6c08fd4cc
global: fix creator plugin discovery 2022-12-23 12:46:14 +01:00
Jakub Jezek
f5cb893dc1
global: creator plugin abstraction for workfile builder template 2022-12-23 12:16:54 +01:00
Jakub Jezek
90303d4137
global: updating docstrings 2022-12-22 11:48:46 +01:00
Jakub Jezek
95b15a9f00
global,nuke,maya: on demand placeholder removal preset attribute 2022-12-22 11:44:35 +01:00
Jakub Trllo
48c4c238f5 added helper function to get fake process id 2022-10-27 18:38:28 +02:00
Ondřej Samohel
de7a6dfcc7
Merge pull request #3719 from simonebarbieri/feature/maya-unreal-layout_existing_scene
Unreal: Layout Loader from Maya for Existing Scenes
2022-10-13 12:35:56 +02:00
Jakub Trllo
a7d82ecbc0
Merge pull request #3838 from pypeclub/feature/OP-3828_Workfile-template-build-enhancements
General: Workfile template build enhancements
2022-09-26 10:14:08 +02:00
Simone Barbieri
e97b6ce01f Fixed path resolving not finding the workfile in certain conditions
In case the workfile only contains the project name, the workfile is not found because while the regex matches, the match doesn't have any group, and so it throws an exception.
2022-09-23 16:18:08 +01:00