Commit graph

150 commits

Author SHA1 Message Date
Jakub Jezek
a09fc58148
flipping order of condition arguments 2023-12-20 15:56:21 +01:00
Jakub Jezek
19666f7df3
Refactor integrate_ftrack_instances.py to update asset names for multiple reviewable items
- Add a condition to also check if multiple_reviewable is True before updating the asset name.
2023-12-20 15:48:47 +01:00
Jakub Trllo
1aca2d3bef expect 'ayon' group as one of option to get custom attributes 2023-12-18 16:19:14 +01:00
Jakub Jezek
d5c5f4f9aa
Merge branch 'develop' into enhancement/OP-6659_nuke-explicit-thumbnail-workflow 2023-12-07 13:15:07 +01:00
Jakub Jezek
a2c37975aa
feat: Add support for multiple reviewable components
This commit adds support for creating multiple reviewable components in the `IntegrateFtrackInstance` plugin. It introduces a new variable `extended_asset_name` to change the asset name of each new component for review. This feature is particularly useful when there are more than one representation to be reviewed.
2023-12-06 12:24:27 +01:00
Jakub Jezek
ec47c7466f
enhancing code 2023-11-21 22:12:41 +01:00
Jakub Jezek
178f044869
ftrack: ignore representations with publish_on_farm tag 2023-11-21 21:49:17 +01:00
Jakub Jezek
166bfb2f31
improving code readability 2023-11-21 14:06:33 +01:00
Jakub Jezek
e6c0504038
unused variable
comment https://github.com/ynput/OpenPype/pull/5939#discussion_r1400418886
2023-11-21 13:59:33 +01:00
Jakub Jezek
73600fb0a8
hound 2023-11-21 13:57:13 +01:00
Jakub Jezek
4ba778e73e
fixing duplication of single thumbnail for multiple reviewables 2023-11-21 13:49:57 +01:00
Jakub Jezek
1c6db9d8ae
Ftrack: rewriting component creation to support multiple thumbnails 2023-11-21 11:45:04 +01:00
Jakub Trllo
7c035a157e fix args names 2023-10-17 12:52:46 +02:00
Jakub Trllo
9ce0ef1d9c use object type id to skip tasks 2023-10-17 11:31:40 +02:00
Jakub Trllo
2e34fc444a skip tasks when looking for asset entity 2023-10-17 10:53:21 +02:00
Roy Nieterau
a492addc54 Reduce artist-facing logs for component integration for Ftrack + tweak "Comment is not set" log also for Kitsu to debug level 2023-09-07 15:55:28 +02:00
Toke Stuart Jepsen
ec054ce939 Fix version 0 when integrating to Ftrack. 2023-08-22 13:00:36 +01:00
Toke Jepsen
7973354fef
Option to start versioning from 0 (#5262)
* Initial version, replaced all hard 1 with 0

* ftrack v0 works only with version cast as str

* workfile tools can set 0

* fixed hound stuff

* fix for auto versioning not working anymore

* fix for not incrementing version

* hound fix

* Settings determined versioning start

* Code cosmetics

* Better failsafe for collecting settings.

* Initial profiles commit

* Hound

* Working profiles

* Update openpype/hosts/webpublisher/plugins/publish/collect_published_files.py

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

* Update openpype/hosts/webpublisher/plugins/publish/collect_published_files.py

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

* Update openpype/plugins/publish/collect_anatomy_instance_data.py

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

* Update openpype/settings/entities/schemas/projects_schema/schema_project_global.json

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

* Illicitit feedback

* Update openpype/pipeline/context_tools.py

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

* Fix collect_published_files

* Working version

* Hound

* Update openpype/pipeline/version_start.py

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

* Update openpype/pipeline/version_start.py

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

* Update openpype/tools/push_to_project/control_integrate.py

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

* Update openpype/hosts/photoshop/plugins/publish/collect_published_version.py

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

* Update openpype/hosts/photoshop/plugins/publish/collect_published_version.py

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

* Update openpype/hosts/webpublisher/plugins/publish/collect_published_files.py

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

* Update openpype/hosts/webpublisher/plugins/publish/collect_published_files.py

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

* Update openpype/hosts/webpublisher/plugins/publish/collect_published_files.py

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

* Update openpype/pipeline/workfile/path_resolving.py

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

* Update openpype/settings/__init__.py

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

* Hound

* Illicitit feedback

* Replace host.name

* Update openpype/plugins/publish/collect_anatomy_instance_data.py

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

* reuse 'task_name' and 'task_type'

* skip hero integration when source version in 0

---------

Co-authored-by: maxpareschi <max.pareschi@gmail.com>
Co-authored-by: Jakub Ježek <jakubjezek001@gmail.com>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Co-authored-by: Jakub Trllo <jakub.trllo@gmail.com>
2023-08-10 13:31:49 +02:00
Jakub Trllo
7debe12c2b
Webpublisher: Cleanup targets (#5418)
* remove remotepublish commands from cli

* use 'automated' target instead ot 'remotepublish'

* removed references to remotepublish

* added webpublish target

* use webpubish targets where automated does not make sense
2023-08-08 11:36:16 +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
82f9da2c8e
Reduce more visual clutter for artists in new publisher reports (#5208) 2023-06-28 17:03:48 +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 Trllo
ce1e45f708
fix key assignment on instance data (#4966) 2023-05-12 16:35:10 +02:00
Roy Nieterau
3fae1f8521 Just some grammar tweaks 2023-03-30 13:59:22 +02:00
Jakub Trllo
289efe25f8
Ftrack: Ftrack additional families filtering (#4633)
* make sure all families are used for additional filtering

* rely on instance and context data instead of legacy_io

* formatting changes

* fix variable values after change of condition

* use 'families' variable for adding 'ftrack' family

* Removed duplicated log

* change variable name
2023-03-17 10:35:53 +01:00
Jakub Trllo
e6bf6add2f modify integrate ftrack instances to be able upload origin filename 2023-02-17 10:48:15 +01:00
Fabia Serra Arrizabalaga
27150e4abb Address feedback on PR and move function to pipeline.publish.lib 2023-02-08 20:23:26 +01:00
Fabia Serra Arrizabalaga
b1ef1b751f Abstract get_representation_path function and use it on shotgrid to fix remote errors with data instances not having 'published_path' 2023-02-08 19:11:20 +01:00
Petr Kalis
f854de4629 OP-4679 - revert back fallback
Availability of comment on instance has been resolved by bumping up order of CollectComment.
2023-01-11 15:06:03 +01:00
Petr Kalis
59e2bd2bdf OP-4679 - updated logging
Printing what is actually missing is more helpful than only full data.
2023-01-10 18:17:15 +01:00
Petr Kalis
48d43f7fea OP-4679 - check comment on context
Check for context must be preserved until old Pyblish is completely eradicated as comment could be filled after collection phase, therefore not caught by collector.
2023-01-10 18:16:31 +01:00
Jakub Trllo
1f05a39522 use comment from instance where possible 2022-12-05 19:31:09 +01:00
Jakub Trllo
7544771744 replace reset with configure locations 2022-12-01 13:29:18 +01:00
Jakub Trllo
f821337a8e don't create and close existing connections 2022-11-23 18:56:17 +01:00
Jakub Trllo
484a77a3ad integrate ftrack api always create new session for each instance processing 2022-11-23 18:11:37 +01:00
Jakub Trllo
5de422dea2 change how custom attributes are filled on entities and how entities are created 2022-11-23 16:38:04 +01:00
Jakub Trllo
36afd8aa7c import to ftrack is not recursion based but queue based method 2022-11-23 16:36:21 +01:00
Jakub Trllo
a78ef54e56 query user at the start of import method instead of requerying it again 2022-11-23 16:35:02 +01:00
Jakub Trllo
5a0cc52732 implemented helper methods to query information we need from ftrack 2022-11-23 16:34:02 +01:00
Jakub Trllo
635c662a8c raise known publish error if project in ftrack was not found 2022-11-23 16:32:04 +01:00
Jakub Trllo
c3b7e32695 skip turning on/off of autosync 2022-11-23 16:30:49 +01:00
Jakub Trllo
82ded66bd6 add thumbnal if there are not reviewables 2022-10-26 11:37:53 +02:00
Petr Kalis
ca32556b11 Fix - tags might be missing on representation 2022-10-14 11:20:39 +02:00
Petr Kalis
7d82506f15 OP-3938 - refactor thumbnail logic
Thumbnail should be created only if there is a movie review.
2022-10-04 17:44:30 +02:00
Petr Kalis
233a0c0040 OP-3938 - Hound 2022-09-23 19:55:12 +02:00
Petr Kalis
50477a4543 OP-3938 - do not create component for not integrated thumbnails 2022-09-22 19:26:36 +02:00
Petr Kalis
57cc55b32d OP-3938 - added metadata method for image representation
Different metadata are needed for video or image repre.
2022-09-22 15:22:58 +02:00
Roy Nieterau
1bc37ace46 Actually break loop early on detected mapping 2022-09-13 15:45:48 +02:00
Roy Nieterau
4466d8a942 Remove redundant logic since just above it's forced to be "upload" when not asset_type 2022-09-13 15:45:11 +02:00
Roy Nieterau
778e0b2e49 Perform case-insensitive lookup 2022-09-13 15:44:20 +02:00